Revision: 5509 Author: pebender Date: Fri Sep 18 05:04:17 2009 Log: - Patched kernel-2.6.*/linxu so that it uses ncurses from the build environment rather than the local system.
http://code.google.com/p/minimyth/source/detail?r=5509 Added: /trunk/gar-minimyth/script/kernel-2.6.30/linux/files/linux-2.6.30.7.patch.gar /trunk/gar-minimyth/script/kernel-2.6.31/linux/files/linux-2.6.31.patch.gar Modified: /trunk/gar-minimyth/html/minimyth/document-changelog.txt /trunk/gar-minimyth/script/kernel-2.6.30/linux/Makefile /trunk/gar-minimyth/script/kernel-2.6.30/linux/checksums /trunk/gar-minimyth/script/kernel-2.6.31/linux/Makefile /trunk/gar-minimyth/script/kernel-2.6.31/linux/checksums /trunk/gar-minimyth/script/minimyth.lib.mk ======================================= --- /dev/null +++ /trunk/gar-minimyth/script/kernel-2.6.30/linux/files/linux-2.6.30.7.patch.gar Fri Sep 18 05:04:17 2009 @@ -0,0 +1,20 @@ +diff -Naur linux-2.6.30.7-old/scripts/kconfig/lxdialog/check-lxdialog.sh linux-2.6.30.7-new/scripts/kconfig/lxdialog/check-lxdialog.sh +--- linux-2.6.30.7-old/scripts/kconfig/lxdialog/check-lxdialog.sh 2009-09-15 10:46:05.000000000 -0700 ++++ linux-2.6.30.7-new/scripts/kconfig/lxdialog/check-lxdialog.sh 2009-09-18 04:48:12.000000000 -0700 +@@ -19,11 +19,11 @@ + # Where is ncurses.h? + ccflags() + { +- if [ -f /usr/include/ncurses/ncurses.h ]; then +- echo '-I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>"' +- elif [ -f /usr/include/ncurses/curses.h ]; then +- echo '-I/usr/include/ncurses -DCURSES_LOC="<ncurses/curses.h>"' +- elif [ -f /usr/include/ncurses.h ]; then ++ if [ -f @GAR_build_DESTDIR@@GAR_build_includedir@/ncurses/ncurses.h ]; then ++ echo '-...@gar_build_destdir@@GAR_build_includedir@/ncurses -DCURSES_LOC="<ncurses.h>"' ++ elif [ -f @GAR_build_DESTDIR@@GAR_build_includedir@/ncurses/curses.h ]; then ++ echo '-...@gar_build_destdir@@GAR_build_includedir@/ncurses -DCURSES_LOC="<ncurses/curses.h>"' ++ elif [ -f @GAR_build_DESTDIR@@GAR_build_includedir@/ncurses.h ]; then + echo '-DCURSES_LOC="<ncurses.h>"' + else + echo '-DCURSES_LOC="<curses.h>"' ======================================= --- /dev/null +++ /trunk/gar-minimyth/script/kernel-2.6.31/linux/files/linux-2.6.31.patch.gar Fri Sep 18 05:04:17 2009 @@ -0,0 +1,20 @@ +diff -Naur linux-2.6.31-old/scripts/kconfig/lxdialog/check-lxdialog.sh linux-2.6.31-new/scripts/kconfig/lxdialog/check-lxdialog.sh +--- linux-2.6.31-old/scripts/kconfig/lxdialog/check-lxdialog.sh 2009-09-09 15:13:59.000000000 -0700 ++++ linux-2.6.31-new/scripts/kconfig/lxdialog/check-lxdialog.sh 2009-09-18 04:44:44.000000000 -0700 +@@ -19,11 +19,11 @@ + # Where is ncurses.h? + ccflags() + { +- if [ -f /usr/include/ncurses/ncurses.h ]; then +- echo '-I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>"' +- elif [ -f /usr/include/ncurses/curses.h ]; then +- echo '-I/usr/include/ncurses -DCURSES_LOC="<ncurses/curses.h>"' +- elif [ -f /usr/include/ncurses.h ]; then ++ if [ -f @GAR_build_DESTDIR@@GAR_build_includedir@/ncurses/ncurses.h ]; then ++ echo '-...@gar_build_destdir@@GAR_build_includedir@/ncurses -DCURSES_LOC="<ncurses.h>"' ++ elif [ -f @GAR_build_DESTDIR@@GAR_build_includedir@/ncurses/curses.h ]; then ++ echo '-...@gar_build_destdir@@GAR_build_includedir@/ncurses -DCURSES_LOC="<ncurses/curses.h>"' ++ elif [ -f @GAR_build_DESTDIR@@GAR_build_includedir@/ncurses.h ]; then + echo '-DCURSES_LOC="<ncurses.h>"' + else + echo '-DCURSES_LOC="<curses.h>"' ======================================= --- /trunk/gar-minimyth/html/minimyth/document-changelog.txt Fri Sep 18 04:39:05 2009 +++ /trunk/gar-minimyth/html/minimyth/document-changelog.txt Fri Sep 18 05:04:17 2009 @@ -81,6 +81,8 @@ Fixed build system - Patched system/g15daemon so that it does not add includedir to CPPFLAGS. + - Patched kernel-2.6.*/linxu so that it uses ncurses from the build + environment rather than the local system. Removed packages Removed myth-trunk/myththemes. ======================================= --- /trunk/gar-minimyth/script/kernel-2.6.30/linux/Makefile Thu Sep 17 20:05:05 2009 +++ /trunk/gar-minimyth/script/kernel-2.6.30/linux/Makefile Fri Sep 18 05:04:17 2009 @@ -5,7 +5,8 @@ MASTER_SITES += http://www.kernel.org/pub/linux/kernel/v$(LINUX_MAJOR_VERSION).$(LINUX_MINOR_VERSION)/testing/ CONFIGFILE = $(DISTNAME)-$(GARCH_FAMILY)-$(GARCH).config DISTFILES = $(DISTNAME).tar.bz2 $(CONFIGFILE) -PATCHFILES = $(DISTNAME)-perl.patch.gar +PATCHFILES = $(DISTNAME).patch.gar +PATCHFILES += $(DISTNAME)-perl.patch.gar PATCHFILES += $(DISTNAME)-via_vblank.patch PATCHFILES += $(DISTNAME)-bttv_lirc.patch PATCHFILES += $(DISTNAME)-unionfs_2.5.2.patch @@ -18,7 +19,7 @@ endef DEPENDS = lang/c -BUILDDEPS = utils/module-init-tools utils/mktemp +BUILDDEPS = lib/ncursesw utils/mktemp utils/module-init-tools CONFIGURE_SCRIPTS = custom BUILD_SCRIPTS = $(WORKSRC)/Makefile ======================================= --- /trunk/gar-minimyth/script/kernel-2.6.30/linux/checksums Thu Sep 17 20:05:05 2009 +++ /trunk/gar-minimyth/script/kernel-2.6.30/linux/checksums Fri Sep 18 05:04:17 2009 @@ -1,4 +1,5 @@ 40ac5c687ffd7b4d456fa61e7b250911 download/linux-2.6.30.7.tar.bz2 +089d4fdb1cf14445df6570f5cd860e2a download/linux-2.6.30.7.patch.gar fe5296a168d34429d5c5ee15c8555720 download/linux-2.6.30.7-perl.patch.gar cf861efaa6501a7235e6caa7278b928c download/linux-2.6.30.7-via_vblank.patch c3bd7284fbc156cd15abf4357b85b34f download/linux-2.6.30.7-bttv_lirc.patch ======================================= --- /trunk/gar-minimyth/script/kernel-2.6.31/linux/Makefile Thu Sep 10 08:46:08 2009 +++ /trunk/gar-minimyth/script/kernel-2.6.31/linux/Makefile Fri Sep 18 05:04:17 2009 @@ -5,7 +5,8 @@ MASTER_SITES += http://www.kernel.org/pub/linux/kernel/v$(LINUX_MAJOR_VERSION).$(LINUX_MINOR_VERSION)/testing/ CONFIGFILE = $(DISTNAME)-$(GARCH_FAMILY)-$(GARCH).config DISTFILES = $(DISTNAME).tar.bz2 $(CONFIGFILE) -PATCHFILES = $(DISTNAME)-perl.patch.gar +PATCHFILES = $(DISTNAME).patch.gar +PATCHFILES += $(DISTNAME)-perl.patch.gar PATCHFILES += $(DISTNAME)-bttv_lirc.patch PATCHFILES += $(DISTNAME)-unionfs_2.5.2.patch PATCHFILES += $(DISTNAME)-disable_dma_for_cfa.patch @@ -17,7 +18,7 @@ endef DEPENDS = lang/c -BUILDDEPS = utils/module-init-tools utils/mktemp +BUILDDEPS = lib/ncursesw utils/mktemp utils/module-init-tools CONFIGURE_SCRIPTS = custom BUILD_SCRIPTS = $(WORKSRC)/Makefile ======================================= --- /trunk/gar-minimyth/script/kernel-2.6.31/linux/checksums Tue Sep 15 14:50:25 2009 +++ /trunk/gar-minimyth/script/kernel-2.6.31/linux/checksums Fri Sep 18 05:04:17 2009 @@ -1,4 +1,5 @@ 84c077a37684e4cbfa67b18154390d8a download/linux-2.6.31.tar.bz2 +5a95a768c99323057afa299e68803a64 download/linux-2.6.31.patch.gar 2191f3bcd2e1155c16a71a1255c281f2 download/linux-2.6.31-perl.patch.gar 4b3dbd5afcc51a2081a1573be3887b9f download/linux-2.6.31-bttv_lirc.patch 0f5b59bc9d7c3bf0611b9bcedea5794d download/linux-2.6.31-unionfs_2.5.2.patch ======================================= --- /trunk/gar-minimyth/script/minimyth.lib.mk Sun Nov 2 21:37:48 2008 +++ /trunk/gar-minimyth/script/minimyth.lib.mk Fri Sep 18 05:04:17 2009 @@ -155,6 +155,7 @@ @cat $(DOWNLOADDIR)/$* \ | sed 's...@gar_build_destdir@%$(build_DESTDIR)%g' \ | sed 's...@gar_build_bindir@%$(build_bindir)%g' \ + | sed 's...@gar_build_includedir@%$(build_includedir)%g' \ | sed 's...@gar_build_qt3bindir@%$(build_qt3bindir)%g' \ | sed 's...@gar_build_qt4bindir@%$(build_qt4bindir)%g' \ | sed 's...@gar_build_kdebindir@%$(build_kdebindir)%g' \ --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "minimyth-commits" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/minimyth-commits?hl=en -~----------~----~----~----~------~----~------~--~---
