Arm Housekeeping

mark_nl · May 12, 2020, 5:30pm

Being pretty close to the first final releases for armhfp (32 bit) a bit housekeeping; meaning it’s not very urgent.

@davidep : To be able to rebuild nethserver-dc arm ns-samba “Assets” should be available NethServer/ns-samba. Is it possible to grep those from my fork and include them in the 4.9.18 release?

@stephdl : A while ago I’v switched from my own rspamd git-repo to a fork building it for Fedora. In the nethsever github-repositories lives a fork of the older one.

Can this be replaced with a fork we actuality using for arm?

(BTW because of native missing hyperscan on el7 in the spec-file arm and aarch64 are exclusive arch’s to avoid the impression nethserver uses this on x86_64)

Gtrz Mark

stephdl · May 12, 2020, 5:34pm

simple you are admin of https://github.com/NethServer/rspamd-spec

mark_nl · May 12, 2020, 5:36pm

thanx, did not know that

Will update it and maintain it there

stephdl · May 12, 2020, 5:36pm

you asked, I did

davidep · May 12, 2020, 8:10pm

I guess I’ve to upload your RPM to the expected URL… I’ll sleep on it

Edit: @mark_nl, release updated! Release 4.9.18 · NethServer/ns-samba · GitHub

mark_nl · May 14, 2020, 7:11am

I have troubles in merging my git rspamd-SPEC repo with the one @nethserver. The origins are different and the only solution I can think of is a blunt force push. Basically meaning overwriting every thing and any clone / fork would become pretty useless…

before doing so i’d like concent of @stephdl and @giacomo - or - do you have suggestions for a cleaner solution?

stephdl · May 14, 2020, 8:01am

Rename my branch to old or stephdl or whatever you think valuable, use yours as master

mark_nl · May 14, 2020, 11:52am

Figured out how to do it clean:

gist.github.com

https://gist.github.com/msrose/2feacb303035d11d2d05

combining-git-repositories.md

# Combining two git repositories

**Use case**: You have repository A with remote location rA, and repository B (which may or may not have remote location rB). You want to do one of two things:

- preserve all commits of both repositories, but replace everything from A with the contents of B, and use rA as your remote location
- actually combine the two repositories, as if they are two branches that you want to merge, using rA as the remote location

**NB**: Check out `git subtree`/`git submodule` and [this Stack Overflow question](http://stackoverflow.com/questions/1425892/how-do-you-merge-two-git-repositories) before going through the steps below. This gist is just a record of how I solved this problem on my own one day. 

Before starting, make sure your local and remote repositories are up-to-date with all changes you need. The following steps use the general idea of changing the remote origin and renaming the local master branch of one of the repos in order to combine the two master branches.

This file has been truncated. show original

So they are merged without a force push