Revision: 5356
http://ipcop.svn.sourceforge.net/ipcop/?rev=5356&view=rev
Author: gespinasse
Date: 2011-01-18 08:15:29 +0000 (Tue, 18 Jan 2011)
Log Message:
-----------
Remove $LFS variable when unneeded
$LFS is actually only defined in toolchain and is empty after as we are in the
chroot
Comment that in lfs/Config
Add -n to gzip -f9 in usb-key, that will not hurt
Modified Paths:
--------------
ipcop/trunk/lfs/Config
ipcop/trunk/lfs/initramfs
ipcop/trunk/lfs/klibc
ipcop/trunk/lfs/usb-key
Modified: ipcop/trunk/lfs/Config
===================================================================
--- ipcop/trunk/lfs/Config 2011-01-17 20:32:54 UTC (rev 5355)
+++ ipcop/trunk/lfs/Config 2011-01-18 08:15:29 UTC (rev 5356)
@@ -27,9 +27,8 @@
URL_SFNET = http://downloads.sourceforge.net/sourceforge
URL_TUWIEN = http://gd.tuwien.ac.at
-# For most packages tarballs are unpacked here and then deleted after
-# installation.
-#
+# For most packages tarballs are unpacked here and then deleted after
installation.
+# hack: $LFS is only defined for toolchain_make and is empty when in chroot
DIR_SRC = $(LFS)/usr/src
DIR_PATCHES = $(DIR_SRC)/src/patches
Modified: ipcop/trunk/lfs/initramfs
===================================================================
--- ipcop/trunk/lfs/initramfs 2011-01-17 20:32:54 UTC (rev 5355)
+++ ipcop/trunk/lfs/initramfs 2011-01-18 08:15:29 UTC (rev 5356)
@@ -678,11 +678,11 @@
# klibc builds a shared library with a unique, unpredictable name and
all the binaries expect
# to find that uniquely named library
- cp -a $(LFS)/lib/klibc-*.so /$(INSTALLER_DIR)/mini-initramfs/lib
+ cp -a /lib/klibc-*.so /$(INSTALLER_DIR)/mini-initramfs/lib
# klibc has a few more programs, but we're trying to keep the
mini-initramfs very very small
for binary in cat cpio insmod mknod mount run-init sh.shared sleep
umount uname xzminidec; do \
- cp -a $(LFS)/usr/lib/klibc/bin/$$binary
/$(INSTALLER_DIR)/mini-initramfs/bin/; \
+ cp -a /usr/lib/klibc/bin/$$binary
/$(INSTALLER_DIR)/mini-initramfs/bin/; \
done
# Make sure the shell has a normal name
Modified: ipcop/trunk/lfs/klibc
===================================================================
--- ipcop/trunk/lfs/klibc 2011-01-17 20:32:54 UTC (rev 5355)
+++ ipcop/trunk/lfs/klibc 2011-01-18 08:15:29 UTC (rev 5356)
@@ -82,7 +82,7 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
- @rm -rf $(DIR_APP) /$(INSTALLER_DIR)/$(PKG_NAME) $(LFS)/usr/lib/klibc
$(LFS)/lib/klibc-*.so
+ @rm -rf $(DIR_APP) /$(INSTALLER_DIR)/$(PKG_NAME) /usr/lib/klibc
/lib/klibc-*.so
cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 -i
$(DIR_PATCHES)/$(PKG_NAME)-1.5.17_insmod.patch
cd $(DIR_APP) && patch -Np1 -i
$(DIR_PATCHES)/$(PKG_NAME)-1.5.17_Kbuild-install.patch
Modified: ipcop/trunk/lfs/usb-key
===================================================================
--- ipcop/trunk/lfs/usb-key 2011-01-17 20:32:54 UTC (rev 5355)
+++ ipcop/trunk/lfs/usb-key 2011-01-18 08:15:29 UTC (rev 5356)
@@ -142,12 +142,11 @@
# copy the entire file system
dd if=$(IMGfs) of=$(IMGzip) bs=512 seek=32
- gzip -f9 $(IMGfdd) $(IMGhdd) $(IMGzip)
- rm -rf $$LFS/tmp/* $(IMGfs)
+ gzip -fn9 $(IMGfdd) $(IMGhdd) $(IMGzip)
+ rm -rf /tmp/* $(IMGfs)
for i in `seq 0 7`; do \
rm -fr /dev/loop$${i}; \
done
-
- # yes we want it rebuild at each time, so no POSTBUILD
+ # yes we want it rebuild at each time, so no POSTBUILD
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
