From 575cedd34852ce7d05a24f11d441a22bfecabfb0 Mon Sep 17 00:00:00 2001 From: wittinobi Date: Thu, 27 Sep 2012 23:26:14 +0200 Subject: [PATCH] fix crosstool, fix kernel-drivers, tune kernel --- archive-patches/kernel-2.6.26.8-cnxt.config | 2 +- archive-patches/kernel-2.6.34.13-cnxt.config | 2 +- archive-patches/kernel-2.6.35.14-cnxt.config | 2 +- archive-patches/kernel-2.6.39.4-cnxt.config | 2 +- make/archives.mk | 7 +--- make/bootstrap.mk | 4 +- make/crosstool.mk | 11 +++--- make/kernel.mk | 39 +++----------------- 8 files changed, 18 insertions(+), 51 deletions(-) diff --git a/archive-patches/kernel-2.6.26.8-cnxt.config b/archive-patches/kernel-2.6.26.8-cnxt.config index 9985e2a..d362fd4 100644 --- a/archive-patches/kernel-2.6.26.8-cnxt.config +++ b/archive-patches/kernel-2.6.26.8-cnxt.config @@ -1180,7 +1180,7 @@ CONFIG_INOTIFY=y CONFIG_INOTIFY_USER=y # CONFIG_QUOTA is not set # CONFIG_AUTOFS_FS is not set -# CONFIG_AUTOFS4_FS is not set +CONFIG_AUTOFS4_FS=m CONFIG_FUSE_FS=m # diff --git a/archive-patches/kernel-2.6.34.13-cnxt.config b/archive-patches/kernel-2.6.34.13-cnxt.config index 43cd676..36167e4 100644 --- a/archive-patches/kernel-2.6.34.13-cnxt.config +++ b/archive-patches/kernel-2.6.34.13-cnxt.config @@ -1482,7 +1482,7 @@ CONFIG_FSNOTIFY=y CONFIG_INOTIFY_USER=y # CONFIG_QUOTA is not set # CONFIG_AUTOFS_FS is not set -# CONFIG_AUTOFS4_FS is not set +CONFIG_AUTOFS4_FS=m CONFIG_FUSE_FS=m # CONFIG_CUSE is not set diff --git a/archive-patches/kernel-2.6.35.14-cnxt.config b/archive-patches/kernel-2.6.35.14-cnxt.config index 96ecc54..aa73a2a 100644 --- a/archive-patches/kernel-2.6.35.14-cnxt.config +++ b/archive-patches/kernel-2.6.35.14-cnxt.config @@ -1511,7 +1511,7 @@ CONFIG_FSNOTIFY=y CONFIG_INOTIFY_USER=y # CONFIG_QUOTA is not set # CONFIG_AUTOFS_FS is not set -# CONFIG_AUTOFS4_FS is not set +CONFIG_AUTOFS4_FS=m CONFIG_FUSE_FS=m # CONFIG_CUSE is not set diff --git a/archive-patches/kernel-2.6.39.4-cnxt.config b/archive-patches/kernel-2.6.39.4-cnxt.config index 8d0114e..33f1740 100644 --- a/archive-patches/kernel-2.6.39.4-cnxt.config +++ b/archive-patches/kernel-2.6.39.4-cnxt.config @@ -1594,7 +1594,7 @@ CONFIG_INOTIFY_USER=y # CONFIG_FANOTIFY is not set # CONFIG_QUOTA is not set # CONFIG_QUOTACTL is not set -# CONFIG_AUTOFS4_FS is not set +CONFIG_AUTOFS4_FS=m CONFIG_FUSE_FS=m # CONFIG_CUSE is not set diff --git a/make/archives.mk b/make/archives.mk index e860a13..8ffd52c 100755 --- a/make/archives.mk +++ b/make/archives.mk @@ -153,9 +153,6 @@ $(ARCHIVE)/vsftpd-2.2.2.tar.gz: $(ARCHIVE)/vsftpd-3.0.2.tar.gz: $(WGET) http://www.fhloston-paradise.de/vsftpd-3.0.2.tar.gz -$(ARCHIVE)/linux-$(CST_KERNEL_VERSION).tar.bz2: - $(WGET) http://www.kernel.org/pub/linux/kernel/v2.6/linux-$(CST_KERNEL_VERSION).tar.bz2 - $(ARCHIVE)/util-linux-2.20.tar.bz2: $(WGET) http://www.fhloston-paradise.de/util-linux-2.20.tar.bz2 @@ -199,7 +196,6 @@ $(ARCHIVE)/crosstool-1.3.2-downloads.tar.bz2: $(WGET) http://www.dbox2world.net/download/gdb-6.8.tar.bz2 $(WGET) http://www.dbox2world.net/download/gmp-4.2.2.tar.bz2 $(WGET) http://www.dbox2world.net/download/libelf-0.8.10.tar.gz - $(WGET) http://www.dbox2world.net/download/linux-2.6.26.8.tar.bz2 $(WGET) http://www.dbox2world.net/download/ltrace_0.5.orig.tar.gz $(WGET) http://www.dbox2world.net/download/mpfr-2.3.1.tar.bz2 $(WGET) http://www.dbox2world.net/download/ncurses-5.6.tar.gz @@ -216,8 +212,7 @@ $(ARCHIVE)/crosstool-1.16.0-downloads.tar.bz2: $(WGET) http://ftp.gnu.org/gnu/gdb/gdb-7.3a.tar.bz2 $(WGET) http://ftp.gnu.org/gnu/gmp/gmp-5.0.2.tar.bz2 $(WGET) http://www.mr511.de/software/libelf-0.8.13.tar.gz - $(WGET) http://pkgs.fedoraproject.org/repo/pkgs/libmpc/mpc-0.9.tar.gz/0d6acab8d214bd7d1fbbc593e83dd00d/mpc-0.9.tar.gz - $(WGET) http://www.dbox2world.net/download/linux-2.6.26.8.tar.bz2 + $(WGET) http://pkgs.fedoraproject.org/repo/pkgs/libmpc/mpc-0.9.tar.gz/0d6acab8d214bd7d1fbbc593e83dd00d/mpc-0.9.tar.gz $(WGET) http://cdn.debian.net/debian/pool/main/l/ltrace/ltrace_0.5.3.orig.tar.gz $(WGET) http://en.sourceforge.jp/frs/g_redir.php?m=jaist&f=%2Fsb6x2x.motorola%2FSBV6x2x_1_0_2_0_SCM01%2F1.0.2.0SCM01%2Fdmalloc-5.5.2.tar.bz2 $(WGET) http://ftp.uni-erlangen.de/mirrors/GNU/mpfr/mpfr-3.1.0.tar.bz2 diff --git a/make/bootstrap.mk b/make/bootstrap.mk index f21dc72..874af1d 100755 --- a/make/bootstrap.mk +++ b/make/bootstrap.mk @@ -65,11 +65,11 @@ $(TARGETPREFIX)/lib/modules/2.6.26.8-nevis: | $(TARGETPREFIX) $(TARGETPREFIX)/lib/modules/2.6.34.13-nevis: | $(TARGETPREFIX) mkdir -p $@ - cp -a $(SOURCE_DIR)/git/DRIVERS/drivers/2.6.39.4-nevis/* $@/ + cp -a $(SOURCE_DIR)/git/DRIVERS/drivers/2.6.34.13-nevis/* $@/ $(TARGETPREFIX)/lib/modules/2.6.35.14-nevis: | $(TARGETPREFIX) mkdir -p $@ - cp -a $(SOURCE_DIR)/git/DRIVERS/drivers/2.6.39.4-nevis/* $@/ + cp -a $(SOURCE_DIR)/git/DRIVERS/drivers/2.6.34.13-nevis/* $@/ $(TARGETPREFIX)/lib/modules/2.6.39.4-nevis: | $(TARGETPREFIX) mkdir -p $@ diff --git a/make/crosstool.mk b/make/crosstool.mk index 7089e89..5aae84f 100755 --- a/make/crosstool.mk +++ b/make/crosstool.mk @@ -1,23 +1,24 @@ # makefile to build crosstool -crosstool: prerequisites | $(ARCHIVE)/crosstool-$(CROSSTOOL_VERSION)-downloads.tar.bz2 $(ARCHIVE)/linux-$(CST_KERNEL_VERSION).tar.bz2; \ +crosstool: prerequisites | $(ARCHIVE)/crosstool-$(CROSSTOOL_VERSION)-downloads.tar.bz2; \ mkdir -p $(BUILD_TMP); \ $(UNTAR)/crosstool-ng-$(CROSSTOOL_VERSION).tar.bz2; \ set -e; unset CONFIG_SITE; cd $(BUILD_TMP)/crosstool-ng-$(CROSSTOOL_VERSION); \ mkdir -p targets/src/; \ - tar -C targets/src/ -xf $(ARCHIVE)/linux-$(CST_KERNEL_VERSION).tar.bz2; \ + tar -C $(GIT_KERNEL) -cp linux-$(CST_KERNEL_VERSION)-cnxt --exclude=.git | tar -C $(BUILD_TMP)/crosstool-ng-$(CROSSTOOL_VERSION)/targets/src -x; \ + tar cfvj $(BASE_DIR)/download/linux-$(CST_KERNEL_VERSION)-cnxt.tar.bz2 $(GIT_KERNEL)/linux-$(CST_KERNEL_VERSION)-cnxt; \ if [ $(CST_KERNEL_VERSION) = "2.6.26.8" ]; then \ - (cd targets/src/linux-2.6.26.8 && \ + (cd targets/src/linux-2.6.26.8-cnxt && \ patch -p1 -i $(PATCHES)/linux-2.6.26.8-new-make.patch && \ patch -p1 -i $(PATCHES)/linux-2.6.26.8-rename-getline.patch && \ patch -p1 -i $(PATCHES)/eglibc-2_8-new-make.patch); \ fi; \ - ln -sf linux-$(CST_KERNEL_VERSION) targets/src/linux-custom; \ + ln -sf linux-$(CST_KERNEL_VERSION)-cnxt targets/src/linux-custom; \ touch targets/src/.linux-custom.extracted; \ cp -a $(PATCHES)/crosstool-ng-$(CROSSTOOL_VERSION)-newconfig .config; \ sed -i -e 's#^CT_LOCAL_TARBALLS_DIR=.*#CT_LOCAL_TARBALLS_DIR="$(BASE_DIR)/download"#' \ -e 's#^CT_PREFIX_DIR=.*#CT_PREFIX_DIR="$(CROSS_BASE)"#' .config \ - -e 's#^CT_KERNEL_LINUX_CUSTOM_LOCATION=.*#CT_KERNEL_LINUX_CUSTOM_LOCATION="$(BASE_DIR)/download/linux-$(CST_KERNEL_VERSION).tar.bz2"#' .config && \ + -e 's#^CT_KERNEL_LINUX_CUSTOM_LOCATION=.*#CT_KERNEL_LINUX_CUSTOM_LOCATION="$(BASE_DIR)/download/linux-$(CST_KERNEL_VERSION)-cnxt.tar.bz2"#' .config && \ NUM_CPUS=$$(expr `getconf _NPROCESSORS_ONLN` \* 2); \ MEM_512M=$$(awk '/MemTotal/ {M=int($$2/1024/512); print M==0?1:M}' /proc/meminfo); \ test $$NUM_CPUS -gt $$MEM_512M && NUM_CPUS=$$MEM_512M; \ diff --git a/make/kernel.mk b/make/kernel.mk index 0d5ee36..d4c941c 100755 --- a/make/kernel.mk +++ b/make/kernel.mk @@ -91,6 +91,7 @@ $(D)/coolstream-kernel-2.6.26.8-cnxt-new: $(D)/coolstream-u-boot | $(TARGETPREFI cp -f $(BUILD_TMP)/linux-2.6.26.8-cnxt-modules/lib/modules/2.6.26.8-nevis/kernel/drivers/usb/serial/ftdi_sio.ko $(TARGETPREFIX)/lib/modules/2.6.26.8-nevis/ftdi_sio.ko cp -f $(BUILD_TMP)/linux-2.6.26.8-cnxt-modules/lib/modules/2.6.26.8-nevis/kernel/drivers/usb/serial/pl2303.ko $(TARGETPREFIX)/lib/modules/2.6.26.8-nevis/pl2303.ko cp -f $(BUILD_TMP)/linux-2.6.26.8-cnxt-modules/lib/modules/2.6.26.8-nevis/kernel/drivers/usb/serial/usbserial.ko $(TARGETPREFIX)/lib/modules/2.6.26.8-nevis/usbserial.ko + cp -f $(BUILD_TMP)/linux-2.6.26.8-cnxt-modules/lib/modules/2.6.26.8-nevis/kernel/fs/autofs4/autofs4.ko $(TARGETPREFIX)/lib/modules/2.6.26.8-nevis/autofs4.ko cp -f $(BUILD_TMP)/linux-2.6.26.8-cnxt-modules/lib/modules/2.6.26.8-nevis/kernel/fs/cifs/cifs.ko $(TARGETPREFIX)/lib/modules/2.6.26.8-nevis/cifs.ko cp -f $(BUILD_TMP)/linux-2.6.26.8-cnxt-modules/lib/modules/2.6.26.8-nevis/kernel/fs/fuse/fuse.ko $(TARGETPREFIX)/lib/modules/2.6.26.8-nevis/fuse.ko touch $@ @@ -121,6 +122,7 @@ $(D)/coolstream-kernel-2.6.34.13-cnxt-new: $(D)/coolstream-u-boot | $(TARGETPREF cp -f $(BUILD_TMP)/linux-2.6.34.13-cnxt-modules/lib/modules/2.6.34.13-nevis/kernel/drivers/usb/serial/pl2303.ko $(TARGETPREFIX)/lib/modules/2.6.34.13-nevis/pl2303.ko cp -f $(BUILD_TMP)/linux-2.6.34.13-cnxt-modules/lib/modules/2.6.34.13-nevis/kernel/drivers/usb/serial/usbserial.ko $(TARGETPREFIX)/lib/modules/2.6.34.13-nevis/usbserial.ko cp -f $(BUILD_TMP)/linux-2.6.34.13-cnxt-modules/lib/modules/2.6.34.13-nevis/kernel/drivers/usb/storage/usb-storage.ko $(TARGETPREFIX)/lib/modules/2.6.34.13-nevis/usb-storage.ko + cp -f $(BUILD_TMP)/linux-2.6.34.13-cnxt-modules/lib/modules/2.6.34.13-nevis/kernel/fs/autofs4/autofs4.ko $(TARGETPREFIX)/lib/modules/2.6.34.13-nevis/autofs4.ko cp -f $(BUILD_TMP)/linux-2.6.34.13-cnxt-modules/lib/modules/2.6.34.13-nevis/kernel/fs/cifs/cifs.ko $(TARGETPREFIX)/lib/modules/2.6.34.13-nevis/cifs.ko cp -f $(BUILD_TMP)/linux-2.6.34.13-cnxt-modules/lib/modules/2.6.34.13-nevis/kernel/fs/fuse/fuse.ko $(TARGETPREFIX)/lib/modules/2.6.34.13-nevis/fuse.ko cp -f $(BUILD_TMP)/linux-2.6.34.13-cnxt-modules/lib/modules/2.6.34.13-nevis/kernel/crypto/md4.ko $(TARGETPREFIX)/lib/modules/2.6.34.13-nevis/md4.ko @@ -152,6 +154,7 @@ $(D)/coolstream-kernel-2.6.35.14-cnxt-new: $(D)/coolstream-u-boot | $(TARGETPREF cp -f $(BUILD_TMP)/linux-2.6.35.14-cnxt-modules/lib/modules/2.6.35.14-nevis+/kernel/drivers/usb/serial/pl2303.ko $(TARGETPREFIX)/lib/modules/2.6.35.14-nevis/pl2303.ko cp -f $(BUILD_TMP)/linux-2.6.35.14-cnxt-modules/lib/modules/2.6.35.14-nevis+/kernel/drivers/usb/serial/usbserial.ko $(TARGETPREFIX)/lib/modules/2.6.35.14-nevis/usbserial.ko cp -f $(BUILD_TMP)/linux-2.6.35.14-cnxt-modules/lib/modules/2.6.35.14-nevis+/kernel/drivers/usb/storage/usb-storage.ko $(TARGETPREFIX)/lib/modules/2.6.35.14-nevis/usb-storage.ko + cp -f $(BUILD_TMP)/linux-2.6.35.14-cnxt-modules/lib/modules/2.6.35.14-nevis+/kernel/fs/autofs4/autofs4.ko $(TARGETPREFIX)/lib/modules/2.6.35.14-nevis/autofs4.ko cp -f $(BUILD_TMP)/linux-2.6.35.14-cnxt-modules/lib/modules/2.6.35.14-nevis+/kernel/fs/cifs/cifs.ko $(TARGETPREFIX)/lib/modules/2.6.35.14-nevis/cifs.ko cp -f $(BUILD_TMP)/linux-2.6.35.14-cnxt-modules/lib/modules/2.6.35.14-nevis+/kernel/fs/fuse/fuse.ko $(TARGETPREFIX)/lib/modules/2.6.35.14-nevis/fuse.ko cp -f $(BUILD_TMP)/linux-2.6.35.14-cnxt-modules/lib/modules/2.6.35.14-nevis+/kernel/crypto/md4.ko $(TARGETPREFIX)/lib/modules/2.6.35.14-nevis/md4.ko @@ -187,6 +190,7 @@ $(D)/coolstream-kernel-2.6.39.4-cnxt-new: $(D)/coolstream-u-boot | $(TARGETPREFI cp -f $(BUILD_TMP)/linux-2.6.39.4-cnxt-modules/lib/modules/2.6.39.4-nevis/kernel/drivers/usb/serial/pl2303.ko $(TARGETPREFIX)/lib/modules/2.6.39.4-nevis/pl2303.ko cp -f $(BUILD_TMP)/linux-2.6.39.4-cnxt-modules/lib/modules/2.6.39.4-nevis/kernel/drivers/usb/serial/usbserial.ko $(TARGETPREFIX)/lib/modules/2.6.39.4-nevis/usbserial.ko cp -f $(BUILD_TMP)/linux-2.6.39.4-cnxt-modules/lib/modules/2.6.39.4-nevis/kernel/drivers/usb/storage/usb-storage.ko $(TARGETPREFIX)/lib/modules/2.6.39.4-nevis/usb-storage.ko + cp -f $(BUILD_TMP)/linux-2.6.39.4-cnxt-modules/lib/modules/2.6.39.4-nevis/kernel/fs/autofs4/autofs4.ko $(TARGETPREFIX)/lib/modules/2.6.39.4-nevis/autofs4.ko cp -f $(BUILD_TMP)/linux-2.6.39.4-cnxt-modules/lib/modules/2.6.39.4-nevis/kernel/fs/cifs/cifs.ko $(TARGETPREFIX)/lib/modules/2.6.39.4-nevis/cifs.ko cp -f $(BUILD_TMP)/linux-2.6.39.4-cnxt-modules/lib/modules/2.6.39.4-nevis/kernel/fs/fuse/fuse.ko $(TARGETPREFIX)/lib/modules/2.6.39.4-nevis/fuse.ko cp -f $(BUILD_TMP)/linux-2.6.39.4-cnxt-modules/lib/modules/2.6.39.4-nevis/kernel/crypto/md4.ko $(TARGETPREFIX)/lib/modules/2.6.39.4-nevis/md4.ko @@ -216,40 +220,7 @@ $(D)/coolstream-kernel-2.6.26.8-cnxt-uvc-new: $(D)/coolstream-u-boot | $(TARGETP cp -f $(BUILD_TMP)/linux-2.6.26.8-cnxt-modules/lib/modules/2.6.26.8-nevis/kernel/drivers/usb/serial/ftdi_sio.ko $(TARGETPREFIX)/lib/modules/2.6.26.8-nevis/ftdi_sio.ko cp -f $(BUILD_TMP)/linux-2.6.26.8-cnxt-modules/lib/modules/2.6.26.8-nevis/kernel/drivers/usb/serial/pl2303.ko $(TARGETPREFIX)/lib/modules/2.6.26.8-nevis/pl2303.ko cp -f $(BUILD_TMP)/linux-2.6.26.8-cnxt-modules/lib/modules/2.6.26.8-nevis/kernel/drivers/usb/serial/usbserial.ko $(TARGETPREFIX)/lib/modules/2.6.26.8-nevis/usbserial.ko + cp -f $(BUILD_TMP)/linux-2.6.26.8-cnxt-modules/lib/modules/2.6.26.8-nevis/kernel/fs/autofs4/autofs4.ko $(TARGETPREFIX)/lib/modules/2.6.26.8-nevis/autofs4.ko cp -f $(BUILD_TMP)/linux-2.6.26.8-cnxt-modules/lib/modules/2.6.26.8-nevis/kernel/fs/cifs/cifs.ko $(TARGETPREFIX)/lib/modules/2.6.26.8-nevis/cifs.ko cp -f $(BUILD_TMP)/linux-2.6.26.8-cnxt-modules/lib/modules/2.6.26.8-nevis/kernel/fs/fuse/fuse.ko $(TARGETPREFIX)/lib/modules/2.6.26.8-nevis/fuse.ko touch $@ - -############################################################### -# Kernel Target from Seife # -############################################################### -# stuff needed to build kernel modules(very experimental...) # -# DO NOT TRY TO USE THIS KERNEL, IT WILL MOST LIKELY NOT WORK # -# # -# ATTENTION: the modules will probably only work with a # -# crosstool-built arm-cx2450x-linux-gnueabi-gcc, # -# or to be more precise, with the same compiler # -# that also built the running kernel! # -# # -# modules are installed in $(TARGETPREFIX)/mymodules and can # -# be picked from there. # -############################################################### - -KVERSION = 2.6.26.8 -KVERSION_FULL = $(KVERSION)-nevis - -$(BUILD_TMP)/linux-$(KVERSION): - tar -C $(BUILD_TMP) -xf $(ARCHIVE)/linux-$(KVERSION).tar.bz2 - cp $(PATCHES)/kernel-seife.config $@/.config - -$(D)/cskernel: $(BUILD_TMP)/linux-$(KVERSION) - pushd $(BUILD_TMP)/linux-$(KVERSION) && \ - $(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- oldconfig && \ - $(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- && \ - $(MAKE) ARCH=arm CROSS_COMPILE=$(TARGET)- INSTALL_MOD_PATH=$(TARGETPREFIX)/mymodules modules_install - touch $@ - -# rule for the autofs4 module - needed by the automounter -# installs the already built module into the "proper" path -$(TARGETPREFIX)/lib/modules/$(KVERSION_FULL)/kernel/fs/autofs4/autofs4.ko: $(D)/cskernel - install -m 644 -D $(TARGETPREFIX)/mymodules/lib/modules/$(KVERSION_FULL)/kernel/fs/autofs4/autofs4.ko $@ -- 2.39.5