summaryrefslogtreecommitdiff
path: root/v4l/scripts/unmerge-trees.sh
AgeCommit message (Collapse)Author
2005-10-25 - Revert build changes with respect to saa7134-alsa.Michael Krufky
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
2005-10-25 - fix offsetsMichael Krufky
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
2005-10-19 - Tree-merge enabled once again.Michael Krufky
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
2005-10-18 - Previous commit broke tree-merge. Here is the correct fix.Michael Krufky
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
2005-10-16 * ../linux/drivers/media/dvb/.cvsignore:Michael Krufky
- Really make cvs quiet. .cvsignore in drivers/media wasn't enough. * ../v4l/scripts/merge-trees.sh: * ../v4l/scripts/unmerge-trees.sh: - Fix offsets. Signed-off-by: Michael Krufky <mkrufky@m1k.net>
2005-10-12fix fuzz & offsetsMichael Krufky
2005-10-10 * ../v4l/Makefile:Michael Krufky
- removed unneeded line. * ../v4l/scripts/makelinks.sh: * ../v4l/scripts/merge-trees.sh: * ../v4l/scripts/unmerge-trees.sh: - fixed offsets. Signed-off-by: Michael Krufky <mkrufky@m1k.net>
2005-10-10 - Alternative build method: 'make kernel-links'Michael Krufky
based on 'makelinks' script in dvb-kernel cvs. - Symlink cvs code into kernel source in order to build cvs code inside kernel build. - Currently requires merged-trees, because of some missing files in v4l-kernel cvs, present in dvb-kernel cvs, such as Makefile - 'make kernel-links' will automatically call 'make merge-trees' - Currently requires a patch to linux/include/linux/videodev.h, which adds #include "compat.h" Patch is applied during 'make kernel-links' and is removed during 'make clean' - videodev.h patch and merge-trees dependency can be removed in the future. Signed-off-by: Michael Krufky <mkrufky@m1k.net>
2005-10-09 * ../v4l/Make.config:Michael Krufky
- removed commented old code. * ../v4l/scripts/merge-trees.sh: * ../v4l/scripts/unmerge-trees.sh: - fix Make.config offsets. Signed-off-by: Michael Krufky <mkrufky@m1k.net>
2005-10-09 - fix fuzz & offsets.Michael Krufky
2005-10-09fix offsetsMichael Krufky
2005-10-09 * ../v4l/scripts/unmerge-trees.sh:Michael Krufky
- Step two, move merged dvb/v4l cvs tree functionality into Makefile. Signed-off-by: Michael Krufky <mkrufky@m1k.net>
2005-10-09fix offsetsMichael Krufky
2005-10-09 - symlink entire dvb-kernel tree into v4l-kernel/linuxMichael Krufky
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
2005-10-09 * ../v4l/scripts/merge-trees.sh:Michael Krufky
* ../v4l/scripts/unmerge-trees.sh: - now make clean calls make unmerge-trees in merged build environment. Signed-off-by: Michael Krufky <mkrufky@m1k.net>
2005-10-09 * ../v4l/Make.config:Michael Krufky
* ../v4l/Makefile: * ../v4l/scripts/merge-trees.sh: * ../v4l/scripts/unmerge-trees.sh: - Step one, move merged dvb/v4l cvs tree functionality into Makefile. Signed-off-by: Michael Krufky <mkrufky@m1k.net>
2005-10-08 * ../linux/include/linux/videodev.h:Michael Krufky
- #include "compat.h" * ../v4l/Makefile: - add two new make commands for tree-merge: make merge make unmerge - this allows tree-merge commands to be called from both top-level v4l-kernel and v4l-kernel/v4l * ../v4l/scripts/merge-trees.sh: * ../v4l/scripts/unmerge-trees.sh: - fix offsets Signed-off-by: Michael Krufky <mkrufky@m1k.net>
2005-10-08dont complain if symlinks are already removed when unmerging v4l/dvb treesMichael Krufky
2005-10-08fix tree-merging scripts for new v4l-kernel treeMichael Krufky
2005-10-07re-diff'd Makefile patchMichael Krufky
2005-10-01dvb-bt8xx and DST build re-renabled in tree-merge.Michael Krufky
2005-09-30DVB/V4L bt8xx tree-merge is currently broken.Michael Krufky
If you need this feature, please use an older video4linux cvs: cvs co -D 9/29/05 video4linux
2005-09-22offsetsMichael Krufky
2005-09-21 * compat.h:Michael Krufky
* cx88-dvb.c: * saa7134-dvb.c: * scripts/merge-trees.sh: * scripts/unmerge-trees.sh: - move some #if kernel version into compat.h Signed-off-by: Michael Krufky <mkrufky@m1k.net>
2005-09-17symlink dvb-core header files to prevent build errors on some systemsMichael Krufky
2005-08-31fixed fuzz and offset in saa7134-dvb mergeMichael Krufky
2005-08-30fixed fuzz and offset in cx88-dvb mergeMichael Krufky
2005-08-28fixed make install in tree-mergeMichael Krufky
2005-08-28 * scripts/merge-trees.sh, scripts/unmerge-trees.sh:Michael Krufky
- include files into tree-merge necessary for the dvb-bt8xx and dst dvb modules, based on bt8xx chips. This also includes all dvb frontends used by bt8xx boards. * bttv.h, videodev.h: - #include "compat.h", needed for tree-merge. Signed-off-by: Michael Krufky <mkrufky@m1k.net>
2005-08-19fix compile of cx88-dvb for lgdt330x in 2.6.13Michael Krufky
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
2005-08-17Updated tree-merging scripts for Makefile changes.Michael Krufky
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
2005-08-07tree merging scripts updated for lgdt330x changesMichael Krufky
2005-07-31 - Better method for Makefile to detect compilation against -mm tree.Michael Krufky
Thanks to Sam Ravnborg <sam@ravnborg.org> Signed-off-by: Michael Krufky <mkrufky@m1k.net>
2005-07-30fix offsetsMichael Krufky
2005-07-30echo message when creating/removing symlinksMichael Krufky
2005-07-30Fix cvs compile for 2.6.13Michael Krufky
2005-07-30Improved method for setting CVS_DVB cflag Signed-off-by: Michael Krufky ↵Michael Krufky
<mkrufky@m1k.net>
2005-07-29 - Include logic to detect merged dvb/v4l cvs trees usingMichael Krufky
tree merging scripts, adding DVB_CVS to EXTRA_CFLAGS. Signed-off-by: Michael Krufky <mkrufky@m1k.net>
2005-07-27Fix offsets in merge/unmerge tree scriptsMichael Krufky
2005-07-25Rename lgdt3302 to lgdt330x.Michael Krufky
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
2005-07-24 * cx88-dvb.c, saa7134-dvb.c, Makefile:Michael Krufky
- The #define CONFIG_DVB_* are actually CFLAGS set my Makefile. CONFIG_* namespace is reserved for Kconfig. This renames them back to HAVE_*. Signed-off-by: Michael Krufky <mkrufky@m1k.net>
2005-07-23 * cx88-dvb.c, saa7134-dvb.c:Michael Krufky
* scripts/merge-trees.sh, scripts/unmerge-trees.sh: - fix compilation warning for missing lgdt3302 when compiling against kernel 2.6.12 without DVB tree. - replaced #IF CONFIG_DVB_* with #IFDEF CONFIG_DVB_* - include linux/config.h - Let kconfig / Makefile decide to include frontend-specific code. (Properly functioning now) Signed-off-by: Michael Krufky <mkrufky@m1k.net>
2005-07-22Minor changes to v4l/dvb tree merging/unmerging scripts.Michael Krufky
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
2005-07-22 * scripts/merge-trees.sh:Michael Krufky
- New script to symlink DVB frontend code from dvb-kernel cvs tree into patched video4linux cvs tree for testing and development across both trees. * scripts/unmerge-trees.sh: - New script to be run after development, and before generating patches or making cvs commits. This removes the symlinks to the frontend code, and reverts the patch to the video4linux tree created by merge-trees.sh . Signed-off-by: Michael Krufky <mkrufky@m1k.net>
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-07 22:23:58 +0000