From: ms <ms@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Date: Fri, 2 Mar 2007 13:23:40 +0000 (+0000)
Subject: Buildfixes...
X-Git-Tag: v2.3-beta1~820
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=c4166091f39e83e9e6a62f3c4fd096ae09163460

Buildfixes...


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@435 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
---

diff --git a/config/rootfiles/common/fcdsl b/config/rootfiles/common/fcdsl
index 9797453ac0..b53c4f1d94 100644
--- a/config/rootfiles/common/fcdsl
+++ b/config/rootfiles/common/fcdsl
@@ -1,7 +1,7 @@
 #etc/fcdsl
 etc/fcdsl/fcdsl.conf
-#lib/modules/2.6.16/extra
-lib/modules/2.6.16/extra/fcdsl.ko
-lib/modules/2.6.16-smp/extra/fcdsl.ko
+#lib/modules/KVER-ipfire/extra
+lib/modules/KVER-ipfire/extra/fcdsl.ko
+lib/modules/KVER-ipfire-smp/extra/fcdsl.ko
 #usr/lib/isdn
 usr/lib/isdn/fdslbase.bin
diff --git a/config/rootfiles/common/fcdsl2 b/config/rootfiles/common/fcdsl2
index 83b36e0ef6..708649172e 100644
--- a/config/rootfiles/common/fcdsl2
+++ b/config/rootfiles/common/fcdsl2
@@ -1,6 +1,6 @@
 #etc/drdsl/drdsl
 etc/drdsl/drdsl.ini
 etc/fcdsl/fcdsl2.conf
-lib/modules/2.6.16/extra/fcdsl2.ko
-lib/modules/2.6.16-smp/extra/fcdsl2.ko
+lib/modules/KVER-ipfire/extra/fcdsl2.ko
+lib/modules/KVER-ipfire-smp/extra/fcdsl2.ko
 usr/lib/isdn/fds2base.bin
diff --git a/config/rootfiles/common/fcdslsl b/config/rootfiles/common/fcdslsl
index dbfe014d94..a3a665bc4e 100644
--- a/config/rootfiles/common/fcdslsl
+++ b/config/rootfiles/common/fcdslsl
@@ -1,4 +1,4 @@
 etc/fcdsl/fcdslsl.conf
-lib/modules/2.6.16/extra/fcdslsl.ko
-lib/modules/2.6.16-smp/extra/fcdslsl.ko
+lib/modules/KVER-ipfire/extra/fcdslsl.ko
+lib/modules/KVER-ipfire-smp/extra/fcdslsl.ko
 usr/lib/isdn/fdssbase.bin
diff --git a/config/rootfiles/common/linux b/config/rootfiles/common/linux
index 170fb2c3ef..56cea62818 100644
--- a/config/rootfiles/common/linux
+++ b/config/rootfiles/common/linux
@@ -652,7 +652,7 @@ lib/modules/KVER-ipfire
 boot/System.map-KVER-ipfire-smp
 boot/config-KVER-ipfire
 boot/vmlinuz-KVER-ipfire-smp
-boot/vmlinuz-smp
+boot/vmlinuz-ipfire-smp
 #lib/modules
 lib/modules/KVER-ipfire-smp
 #lib/modules/KVER-ipfire-smp/build
diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 6015416a4d..2137143a2f 100644
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -140,9 +140,7 @@
 * libvorbis-1.1.2
 * libwww-perl-5.803
 * libxml2-2.6.26
-* linux-2.6.16.29-ipfire
 * linux-2.6.16.42
-* linux-2.6.19.5
 * linux-atm-2.4.1
 * linux-libc-headers-2.6.12.0
 * linuxigd-0.95
@@ -208,7 +206,6 @@
 * rp-pppoe-3.8
 * rrdtool-1.2.15
 * rsync-2.6.8
-* samba-3.0.23d
 * samba-3.0.24
 * screen-4.0.2
 * sed-4.1.5
diff --git a/lfs/initrd b/lfs/initrd
index 5b63a28977..e076429cde 100644
--- a/lfs/initrd
+++ b/lfs/initrd
@@ -53,7 +53,7 @@ $(TARGET) :
 	rm -f /install/images/initrd
 
 	# Finish up initrd directory
-	-mkdir -p /install/initrd/{dev,etc,mnt,root,lib/modules/$(KVER)/kernel/drivers,cdrom,dev,harddisk,proc,tmp,usr/share/terminfo/l,var/run,sys} && \
+	-mkdir -p /install/initrd/{dev,etc,mnt,root,lib/modules/$(KVER)-ipfire/kernel/drivers,cdrom,dev,harddisk,proc,tmp,usr/share/terminfo/l,var/run,sys} && \
 	cd /install/initrd/etc && rm -f fstab
 	cp -aRf $(DIR_SRC)/config/install/* /install/initrd/etc/
 	rm -rf /install/initrd/etc{,/udev,/udev/rules.d}/.svn
@@ -62,58 +62,56 @@ $(TARGET) :
 	cp -f /usr/share/terminfo/l/linux /install/initrd/usr/share/terminfo/l
 
 	# Install SCSI Drivers
-	cp -rf /lib/modules/$(KVER)/kernel/drivers/{scsi,message/fusion} \
-		/lib/modules/$(KVER)/kernel/drivers/block/{DAC960.ko,cpqarray.ko,cciss.ko} \
-		/lib/modules/$(KVER)/kernel/drivers/ide \
-		/lib/modules/$(KVER)/kernel/drivers/cdrom \
-		/lib/modules/$(KVER)/kernel/drivers/ieee1394 \
-		/install/initrd/lib/modules/$(KVER)/kernel/drivers/
-	rm -f	/install/initrd/lib/modules/$(KVER)/kernel/drivers/message/fusion/mptlan*
+	cp -rf /lib/modules/$(KVER)-ipfire/kernel/drivers/scsi \
+		/lib/modules/$(KVER)-ipfire/kernel/drivers/block/{DAC960.ko,cpqarray.ko,cciss.ko} \
+		/lib/modules/$(KVER)-ipfire/kernel/drivers/ide \
+		/install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/
+	rm -f	/install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/message/fusion/mptlan*
 
 	# make new dependencies 
-	depmod -a -F /boot/System.map-$(KVER) $(KVER)
-	depmod -a -F /boot/System.map-$(KVER)-smp $(KVER)-smp
+	depmod -a -F /boot/System.map-$(KVER)-ipfire $(KVER)-ipfire
+	depmod -a -F /boot/System.map-$(KVER)-ipfire-smp $(KVER)-ipfire-smp
 
 	cd / && tar -cvf /tmp/drivers.tar \
-		--exclude=lib/modules/$(KVER)/kernel/{arch,fs} \
-		--exclude=lib/modules/$(KVER)/kernel/drivers/{acpi,atm,bluetooth,block,char,cdrom,hwmon,ide} \
-		--exclude=lib/modules/$(KVER)/kernel/drivers/{ieee1394,isdn,mmc,scsi,md,message,video} \
-		--exclude=lib/modules/$(KVER)/kernel/drivers/net/{wan,ppp*,slip*,slhc*,tun*,wireless} \
-		--exclude=lib/modules/$(KVER)/kernel/drivers/usb/{atm,input,storage,host} \
-		--exclude=lib/modules/$(KVER)/kernel/drivers/usb/{3cp4218.ko,acm.ko,amedyn.ko,cxacru.ko} \
-		--exclude=lib/modules/$(KVER)/kernel/drivers/usb/{speedtch.ko,hid.ko,usbcore.ko,at76c50*.ko} \
-		--exclude=lib/modules/$(KVER)/kernel/net/{8021q,atm,bluetooth,bridge,ieee80211,ipsec,ipv4} \
-		--exclude=lib/modules/$(KVER)/kernel/net/{wanrouter,netfilter,sched} \
-		--exclude=lib/modules/$(KVER)/{build,extra,misc,modules.*,source} \
-		lib/modules/$(KVER)
+		--exclude=lib/modules/$(KVER)-ipfire/kernel/{arch,fs} \
+		--exclude=lib/modules/$(KVER)-ipfire/kernel/drivers/{acpi,atm,bluetooth,block,char,cdrom,hwmon,ide} \
+		--exclude=lib/modules/$(KVER)-ipfire/kernel/drivers/{ieee1394,isdn,mmc,scsi,md,video} \
+		--exclude=lib/modules/$(KVER)-ipfire/kernel/drivers/net/{wan,ppp*,slip*,slhc*,tun*,wireless} \
+		--exclude=lib/modules/$(KVER)-ipfire/kernel/drivers/usb/{atm,input,storage,host} \
+		--exclude=lib/modules/$(KVER)-ipfire/kernel/drivers/usb/{3cp4218.ko,acm.ko,amedyn.ko,cxacru.ko} \
+		--exclude=lib/modules/$(KVER)-ipfire/kernel/drivers/usb/{speedtch.ko,hid.ko,usbcore.ko,at76c50*.ko} \
+		--exclude=lib/modules/$(KVER)-ipfire/kernel/net/{8021q,atm,bluetooth,bridge,ieee80211,ipsec,ipv4} \
+		--exclude=lib/modules/$(KVER)-ipfire/kernel/net/{wanrouter,netfilter,sched} \
+		--exclude=lib/modules/$(KVER)-ipfire/{build,extra,misc,modules.*,source} \
+		lib/modules/$(KVER)-ipfire
 	cd /install/initrd/ && tar -xvf /tmp/drivers.tar && rm -f /tmp/drivers.tar
 
 	# Extra modules
-	-mkdir -p /install/initrd/lib/modules/$(KVER)/kernel/drivers/scsi
-	cp -f /lib/modules/$(KVER)/kernel/drivers/scsi/{scsi_mod.ko,sd_mod.ko,sr_mod.ko} \
-		/install/initrd/lib/modules/$(KVER)/kernel/drivers/scsi/
+	-mkdir -p /install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/scsi
+	cp -f /lib/modules/$(KVER)-ipfire/kernel/drivers/scsi/{scsi_mod.ko,sd_mod.ko,sr_mod.ko} \
+		/install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/scsi/
 
-	-mkdir -p /install/initrd/lib/modules/$(KVER)/kernel/drivers/usb/storage
-	cp -f /lib/modules/$(KVER)/kernel/drivers/usb/storage/*.ko \
-		/install/initrd/lib/modules/$(KVER)/kernel/drivers/usb/storage/
+	-mkdir -p /install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/usb/storage
+	cp -f /lib/modules/$(KVER)-ipfire/kernel/drivers/usb/storage/*.ko \
+		/install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/usb/storage/
 
-	-mkdir -p /install/initrd/lib/modules/$(KVER)/kernel/drivers/usb/host
-	cp -f /lib/modules/$(KVER)/kernel/drivers/usb/host/*.ko \
-		/install/initrd/lib/modules/$(KVER)/kernel/drivers/usb/host
+	-mkdir -p /install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/usb/host
+	cp -f /lib/modules/$(KVER)-ipfire/kernel/drivers/usb/host/*.ko \
+		/install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/usb/host
 
-	-mkdir -p /install/initrd/lib/modules/$(KVER)/kernel/drivers/usb/input
-	cp -f /lib/modules/$(KVER)/kernel/drivers/usb/input/usbhid.ko \
-		/install/initrd/lib/modules/$(KVER)/kernel/drivers/usb/input
+	-mkdir -p /install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/usb/input
+	cp -f /lib/modules/$(KVER)-ipfire/kernel/drivers/usb/input/usbhid.ko \
+		/install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/usb/input
 
-	-mkdir -p /install/initrd/lib/modules/$(KVER)/kernel/drivers/usb/core
-	cp -f /lib/modules/$(KVER)/kernel/drivers/usb/core/*.ko \
-		/install/initrd/lib/modules/$(KVER)/kernel/drivers/usb/core
+	-mkdir -p /install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/usb/core
+	cp -f /lib/modules/$(KVER)-ipfire/kernel/drivers/usb/core/*.ko \
+		/install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/usb/core
 
 	# File system
-	-mkdir -p /install/initrd/lib/modules/$(KVER)/kernel/fs
-	cp -rf /lib/modules/$(KVER)/kernel/fs/* /install/initrd/lib/modules/$(KVER)/kernel/fs
+	-mkdir -p /install/initrd/lib/modules/$(KVER)-ipfire/kernel/fs
+	cp -rf /lib/modules/$(KVER)-ipfire/kernel/fs/* /install/initrd/lib/modules/$(KVER)-ipfire/kernel/fs
 
-	cp -f /lib/modules/$(KVER)/modules.* /install/initrd/lib/modules/$(KVER)
+	cp -f /lib/modules/$(KVER)-ipfire/modules.* /install/initrd/lib/modules/$(KVER)-ipfire
 
 	cp /opt/$(MACHINE)-uClibc/lib/libgcc_s.so.1 /install/initrd/lib/
 
@@ -125,7 +123,7 @@ $(TARGET) :
 	cp -aR /install/initrd/* /install/mnt
 
 	# make new dependencies
-	depmod -a -F /boot/System.map-$(KVER) $(KVER)
+	depmod -a -F /boot/System.map-$(KVER)-ipfire $(KVER)-ipfire
 
 	mksquashfs /install/initrd /install/images/initrd
 	cd /install/initrd && find ./ -ls > $(DIR_INFO)/_build.initrd.log
diff --git a/lfs/ipp2p b/lfs/ipp2p
index cf206fdc86..e2670f7b62 100644
--- a/lfs/ipp2p
+++ b/lfs/ipp2p
@@ -66,14 +66,14 @@ $(TARGET) :
 	cd $(DIR_SRC) && ln -sf iptables-* iptables
 ifeq "$(SMP)" "1"
 	cd $(DIR_APP) && make ipt_ipp2p.ko
-	cp -f $(DIR_APP)/ipt_ipp2p.ko /lib/modules/$(KVER)-smp/kernel/net/ipv4/netfilter
+	cp -f $(DIR_APP)/ipt_ipp2p.ko /lib/modules/$(KVER)-ipfire-smp/kernel/net/ipv4/netfilter
 else
 ifeq "$(IPT)" "1"
 	cd $(DIR_APP) && make
 	cp -f $(DIR_APP)/libipt_ipp2p.o /lib/iptables
 else
 	cd $(DIR_APP) && make ipt_ipp2p.ko
-	cp -f $(DIR_APP)/ipt_ipp2p.ko /lib/modules/$(KVER)/kernel/net/ipv4/netfilter
+	cp -f $(DIR_APP)/ipt_ipp2p.ko /lib/modules/$(KVER)-ipfire/kernel/net/ipv4/netfilter
 endif
 endif
 	@rm -rf $(DIR_APP) $(DIR_SRC)/iptables-*
diff --git a/lfs/linux b/lfs/linux
index 417931fd19..ce4e15230d 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -174,7 +174,7 @@ ifeq "$(SMP)" "1"
 	cd $(DIR_APP) && cp -v arch/i386/boot/bzImage /boot/vmlinuz-$(VER)-ipfire-smp
 	cd $(DIR_APP) && cp -v System.map /boot/System.map-$(VER)-ipfire-smp
 	cd $(DIR_APP) && cp -v .config /boot/config-$(VER)-ipfire
-	ln -sf vmlinuz-$(VER)-smp /boot/vmlinuz-ipfire-smp
+	ln -sf vmlinuz-$(VER)-ipfire-smp /boot/vmlinuz-ipfire-smp
 	cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules
 	cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules_install
 	#cd $(DIR_SRC)/openswan-* && make KERNELSRC=/usr/src/$(THISAPP) CC=$(CC) module