[leaf-commits] src/bering-uclibc4/source/linux kernel-mkmakefile.patch, NONE, 1.1 buildtool.cfg, 1.6, 1.7 buildtool.mk, 1.7, 1.8 binutils-fix.patch.gz, 1.2, NONE
Andrew <[email protected]>
| Newsgroups | gmane.linux.leaf.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/leaf/src/bering-uclibc4/source/linux In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv20640/linux Modified Files: buildtool.cfg buildtool.mk Added Files: kernel-mkmakefile.patch Removed Files: binutils-fix.patch.gz Log Message: First try to make multi-kernel distro --- binutils-fix.patch.gz DELETED --- Index: buildtool.cfg =================================================================== RCS file: /cvsroot/leaf/src/bering-uclibc4/source/linux/buildtool.cfg,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** buildtool.cfg 16 Oct 2010 13:25:08 -0000 1.6 --- buildtool.cfg 31 Oct 2010 23:11:44 -0000 1.7 *************** *** 25,45 **** </File> ! <File binutils-fix.patch.gz> Server = cvs4-sourceforge Directory = linux - envname = KERNEL_PATCH2 Revision = HEAD </File> ! <File buildtool.mk> Server = cvs4-sourceforge Directory = linux Revision = HEAD </File> ! <File Bering-2.6.35.7.config> Server = cvs4-sourceforge Directory = linux ! envname = LINUX_CONFIG Revision = HEAD </File> --- 25,45 ---- </File> ! <File buildtool.mk> Server = cvs4-sourceforge Directory = linux Revision = HEAD </File> ! <File Bering-2.6.35.7.config> Server = cvs4-sourceforge Directory = linux + envname = LINUX_CONFIG Revision = HEAD </File> ! <File Bering-2.6.35.7-i686.patch> Server = cvs4-sourceforge Directory = linux ! envname = LINUX_CONFPATCH-i686 Revision = HEAD </File> Index: buildtool.mk =================================================================== RCS file: /cvsroot/leaf/src/bering-uclibc4/source/linux/buildtool.mk,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** buildtool.mk 16 Oct 2010 13:25:08 -0000 1.7 --- buildtool.mk 31 Oct 2010 23:11:44 -0000 1.8 *************** *** 7,39 **** include $(MASTERMAKEFILE) PERLVER=$(shell ls $(BT_STAGING_DIR)/usr/lib/perl5 2>/dev/null) ! $(BT_LINUX_DIR)/.source: bzcat $(KERNEL_SOURCE) | tar -xvf - ! ln -sf linux-2.6.35.7 linux ! cp $(LINUX_CONFIG) linux/.config ! cat $(KERNEL_PATCH1) | patch -d linux/lib -p0 ! # zcat $(KERNEL_PATCH2) | patch -d linux -p1 ! touch $(BT_LINUX_DIR)/.source ! $(BT_LINUX_DIR)/.configured: $(BT_LINUX_DIR)/.source ! perl -i -p -e 's,$(EXTRAVERSION)-grsec,$(EXTRAVERSION),g' $(BT_LINUX_DIR)/Makefile ! $(MAKE) -C linux oldconfig ([ -$(PERLVER) = - ] || export PERLLIB=$(BT_STAGING_DIR)/usr/lib/perl5/$(PERLVER); \ ! $(MAKE) -C linux include/linux/version.h headers_install) ! cp -r linux/usr/include $(BT_STAGING_DIR)/ ! touch $(BT_LINUX_DIR)/.configured ! source: $(BT_LINUX_DIR)/.source $(BT_LINUX_DIR)/.configured ! build: $(BT_LINUX_DIR)/.configured echo "nothing done here right now, all done by buildenv and kernel package" clean: ! -rm $(BT_LINUX_DIR)/.configured ! $(MAKE) -C linux clean srcclean: ! rm -rf linux ! rm -rf linux-2.6.35.7 --- 7,49 ---- include $(MASTERMAKEFILE) + LINVER=2.6.35.7 + PATCHPREF=Bering-$(LINVER) PERLVER=$(shell ls $(BT_STAGING_DIR)/usr/lib/perl5 2>/dev/null) ! .source: bzcat $(KERNEL_SOURCE) | tar -xvf - ! (for i in $(KARCHS); do \ ! cp $(LINUX_CONFIG) $(LINUX_CONFIG)-$$i && \ ! patch -i $(PATCHPREF)-$$i.patch -o $(LINUX_CONFIG)-$$i && \ ! mkdir -p linux-$$i && cd linux-$$i || exit 1; \ ! cp ../$(LINUX_CONFIG)-$$i .config || exit 1; cd .. ; \ ! done) ! cat $(KERNEL_PATCH1) | patch -d linux-$(LINVER)/lib -p0 ! cat $(KERNEL_PATCH2) | patch -d linux-$(LINVER) -p1 ! touch .source ! .configured: .source ! #Hack with SUBVERSION/EXTRALEVEL for other packages kernel version detection routines ([ -$(PERLVER) = - ] || export PERLLIB=$(BT_STAGING_DIR)/usr/lib/perl5/$(PERLVER); \ ! for i in $(KARCHS); do $(MAKE) -C linux-$(LINVER) O=../linux-$$i oldconfig || \ ! exit 1; done ; \ ! $(MAKE) -C linux-$$i include/linux/version.h headers_install && \ ! cp -r linux-$$i/usr/include $(BT_STAGING_DIR)/) ! touch .configured ! source: .source .configured ! build: .configured echo "nothing done here right now, all done by buildenv and kernel package" clean: ! -rm .configured ! for i in $(KARCHS); do rm -rf linux-$$i; done srcclean: ! for i in $(KARCHS); do rm -rf linux-$$i; done ! rm -rf linux-$(LINVER) ! -rm .configured ! -rm .source ! --- NEW FILE: kernel-mkmakefile.patch --- diff -aur linux-2.6.35.7/Makefile linux-2.6.35.7.new/Makefile --- linux-2.6.35.7/Makefile 2010-09-29 04:09:08.000000000 +0300 +++ linux-2.6.35.7.new/Makefile 2010-11-01 01:04:05.232770267 +0200 @@ -400,7 +400,8 @@ ifneq ($(KBUILD_SRC),) $(Q)ln -fsn $(srctree) source $(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkmakefile \ - $(srctree) $(objtree) $(VERSION) $(PATCHLEVEL) + $(srctree) $(objtree) $(VERSION) $(PATCHLEVEL) \ + $(SUBLEVEL) $(EXTRAVERSION) endif # To make sure we do not include .config for any of the *config targets diff -aur linux-2.6.35.7/scripts/mkmakefile linux-2.6.35.7.new/scripts/mkmakefile --- linux-2.6.35.7/scripts/mkmakefile 2010-09-29 04:09:08.000000000 +0300 +++ linux-2.6.35.7.new/scripts/mkmakefile 2010-11-01 01:03:29.748316337 +0200 @@ -8,6 +8,8 @@ # $2 - Output directory # $3 - version # $4 - patchlevel +# $5 - sublevel +# $6 - extraversion test ! -r $2/Makefile -o -O $2/Makefile || exit 0 @@ -26,6 +28,8 @@ VERSION = $3 PATCHLEVEL = $4 +SUBLEVEL = $5 +EXTRAVERSION = $6 lastword = \$(word \$(words \$(1)),\$(1)) makedir := \$(dir \$(call lastword,\$(MAKEFILE_LIST))) ------------------------------------------------------------------------------ Nokia and AT&T present the 2010 Calling All Innovators-North America contest Create new apps & games for the Nokia N8 for consumers in U.S. and Canada $10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store http://p.sf.net/sfu/nokia-dev2dev