I am not sure, if I got your problem right. But git provides facilities to only pick what you need from remote. You can create a branch with your changes and pick new stuff from the master.
#einzelne Dateien: git checkout <BRANCH> -- <DATAI> #gesamter Ordner: git checkout <BRANCH> -- <ORDNER>/*You can also pick only some lines:
git checkout -p Quellenbranch -- path/to/fileQuellenbranch is normally origin/master.Changes for a particular system get's committed to cfgfs
Regards
Martin
Am 29.11.2017 um 18:52 schrieb Diez B. Roggisch:
Hi all, I’m facing a bit of a conundrum, and would like to discuss this with other users so we can arrive at a hopefully mutually beneficial solution. I’m currently working on getting a raspberry pi compute module 3 to work as a so-called ethernet gadget. This means I have to use quite a range of facilities: - loading specific modules. But not always! Only on demand. - using mdev, with custom rules - using avahi-autopid - a whole bunch of scripts (I prefer python, because I really don’t like bash/shell if I don’t have to use it) Now this touches files mostly in /etc, and some of the problems (like loading the modules deferred) could benefit from inittab or init.d integration. Of course I can (and already do) use the extra-folder to customise all things in /etc. But this means that I lose the ability to profit from newer OpenADK versions or certain features. E.g. a generated rc.conf. So I wonder how best to achieve this? For the sake of the argument lets assume I can’t write my own OpenADK package due to lack of genericness. My current thinking would some kind of hook into either make, or latest the install.sh (not toooo thrilled about that, because it’s huge and I need understanding it better). Any other suggestions, or pointers to something I’m missing? Cheers, Diez
_______________________________________________ dev mailing list dev@openadk.org https://mailman.openadk.org/cgi-bin/mailman/listinfo/dev