From 1b273e8f78cb0f9c3c01e2d864846674f4062e2f Mon Sep 17 00:00:00 2001 From: ms Date: Sun, 5 Aug 2007 20:27:46 +0000 Subject: [PATCH] mISDN auch im Kernel auf Version 1.1.5 gebracht. git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@738 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- lfs/Config | 4 ++-- lfs/linux | 11 ++++------- make.sh | 32 ++++++++++++++++---------------- 3 files changed, 22 insertions(+), 25 deletions(-) diff --git a/lfs/Config b/lfs/Config index 7a0110a022..3570988625 100644 --- a/lfs/Config +++ b/lfs/Config @@ -69,10 +69,10 @@ define PREBUILD if [ -f $(DIR_SRC)/linux-$(KVER) ]; then \ if [ "$(SMP)" = "" ]; then \ cd $(DIR_SRC)/linux-$(KVER) && \ - sed -i -e 's+^EXTRAVERSION.*$$+EXTRAVERSION\ =\ $(word 4,$(subst ., .,$(KVER)))+' Makefile; \ + sed -i -e 's+^EXTRAVERSION.*$$+EXTRAVERSION\ =\ $(word 4,$(subst ., .,$(KVER)))-ipfire+' Makefile; \ else \ cd $(DIR_SRC)/linux-$(KVER) && \ - sed -i -e 's+^EXTRAVERSION.*$$+EXTRAVERSION\ =\ $(word 4,$(subst ., .,$(KVER)))-smp+' Makefile; \ + sed -i -e 's+^EXTRAVERSION.*$$+EXTRAVERSION\ =\ $(word 4,$(subst ., .,$(KVER)))-ipfire-smp+' Makefile; \ fi; \ fi endef diff --git a/lfs/linux b/lfs/linux index 9e67a7b007..d457cb2c48 100644 --- a/lfs/linux +++ b/lfs/linux @@ -63,7 +63,7 @@ iptables-1.3.5.tar.bz2 = $(URL_IPFIRE)/iptables-1.3.5.tar.bz2 netfilter-layer7-v2.9.tar.gz = $(URL_IPFIRE)/netfilter-layer7-v2.9.tar.gz patch-2.6.16-nath323-1.3.bz2 = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2 squashfs3.2-r2.tar.gz = $(URL_IPFIRE)/squashfs3.2-r2.tar.gz -mISDN-1_1_3.tar.gz = $(URL_IPFIRE)/mISDN-1_1_3.tar.gz +mISDN-1_1_5.tar.gz = $(URL_IPFIRE)/mISDN-1_1_5.tar.gz openswan-2.4.9.tar.gz = $(URL_IPFIRE)/openswan-2.4.9.tar.gz $(DL_FILE)_MD5 = cc2106c6188675187d636aa518b04958 @@ -73,7 +73,7 @@ iptables-1.3.5.tar.bz2_MD5 = 00fb916fa8040ca992a5ace56d905ea5 netfilter-layer7-v2.9.tar.gz_MD5 = ebf9043a5352ebe6dbd721989ef83dee patch-2.6.16-nath323-1.3.bz2_MD5 = f926409ff703a307baf54b57ab75d138 squashfs3.2-r2.tar.gz_MD5 = bf360b92eba9e6d5610196ce2e02fcd1 -mISDN-1_1_3.tar.gz_MD5 = d29bcf48f16fc8a9b9f3552d111b308d +mISDN-1_1_5.tar.gz_MD5 = 93b1cff7817b82638a0475c2b7b7f1b6 openswan-2.4.9.tar.gz_MD5 = 845f12d80d443cfa1a52f2b53b987bee install : $(TARGET) @@ -158,8 +158,8 @@ endif # mISDN cd $(DIR_SRC) && rm -rf mISDN-* - cd $(DIR_SRC) && tar xfz $(DIR_DL)/mISDN-1_1_3.tar.gz - cd $(DIR_SRC)/mISDN-1_1_3 && yes 'yes' | ./std2kern -k /usr/src/linux + cd $(DIR_SRC) && tar xfz $(DIR_DL)/mISDN-1_1_5.tar.gz + cd $(DIR_SRC)/mISDN-1_1_5 && yes 'yes' | ./std2kern -k /usr/src/linux ifeq "$(SMP)" "" # Only do this once on the non-SMP pass @@ -198,9 +198,6 @@ else cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules_install endif - # remove symlinked pcmcia directory - -rm -rf /lib/modules/$(VER)-ipfire{,-smp}/pcmcia - ifeq "$(SMP)" "" # Only do this once on the non-SMP pass cd $(DIR_APP) && install -m 755 usr/gen_init_cpio /sbin/ diff --git a/make.sh b/make.sh index 03faf90642..31e5fc013b 100755 --- a/make.sh +++ b/make.sh @@ -82,11 +82,11 @@ prepareenv() { # # ############################################################################ if [ ! "$BASH" ]; then - exiterror "BASH environment variable is not set. You're probably running the wrong shell." + exiterror "BASH environment variable is not set. You're probably running the wrong shell." fi if [ -z "${BASH_VERSION}" ]; then - exiterror "Not running BASH shell." + exiterror "Not running BASH shell." fi @@ -106,10 +106,10 @@ prepareenv() { echo -ne "Resetting our nice level to $NICE" | tee -a $LOGFILE renice $NICE $$ > /dev/null if [ `nice` != "$NICE" ]; then - beautify message FAIL - exiterror "Failed to set correct nice level" + beautify message FAIL + exiterror "Failed to set correct nice level" else - beautify message DONE + beautify message DONE fi @@ -120,10 +120,10 @@ prepareenv() { ############################################################################ echo -ne "Checking if we're running as root user" | tee -a $LOGFILE if [ `id -u` != 0 ]; then - beautify message FAIL - exiterror "Not building as root" + beautify message FAIL + exiterror "Not building as root" else - beautify message DONE + beautify message DONE fi @@ -136,13 +136,13 @@ prepareenv() { BASE_DEV=`df -P -k $BASEDIR | tail -n 1 | awk '{ print $1 }'` BASE_ASPACE=`df -P -k $BASEDIR | tail -n 1 | awk '{ print $4 }'` if (( 2048000 > $BASE_ASPACE )); then - BASE_USPACE=`du -skx $BASEDIR | awk '{print $1}'` - if (( 2048000 - $BASE_USPACE > $BASE_ASPACE )); then - beautify message FAIL - exiterror "Not enough temporary space available, need at least 2GB on $BASE_DEV" - fi + BASE_USPACE=`du -skx $BASEDIR | awk '{print $1}'` + if (( 2048000 - $BASE_USPACE > $BASE_ASPACE )); then + beautify message FAIL + exiterror "Not enough temporary space available, need at least 2GB on $BASE_DEV" + fi else - beautify message DONE + beautify message DONE fi ############################################################################ @@ -161,10 +161,10 @@ prepareenv() { rm -f /tools fi if [ ! -a /tools ]; then - ln -s $BASEDIR/build/tools / + ln -s $BASEDIR/build/tools / fi if [ ! -h /tools ]; then - exiterror "Could not create /tools symbolic link." + exiterror "Could not create /tools symbolic link." fi # Setup environment -- 2.39.2