Author: alexander
Date: 2006-06-17 07:01:10 -0600 (Sat, 17 Jun 2006)
New Revision: 1584
Removed:
trunk/uname/
Modified:
trunk/Makefile
trunk/packages/binutils/Makefile
trunk/packages/bison/Makefile
trunk/packages/coreutils/Makefile
trunk/packages/diffutils/Makefile
trunk/packages/gcc/Makefile
trunk/packages/glibc/Makefile
trunk/packages/iana-etc/Makefile
trunk/packages/man-pages/Makefile
trunk/packages/ncurses/Makefile
trunk/packages/perl/Makefile
trunk/packages/readline/Makefile
trunk/packages/tcl/Makefile
trunk/packages/udev/Makefile
trunk/scripts/config.site
trunk/vars/vars.ppc
trunk/vars/vars.sparc
trunk/vars/vars.x86
Log:
* Dropped the uname hack in favour of proper compiler configuration
* Added a simple config.site that sets the architecture
* Perl architecture directory changed from i686-linux to i486-linux
* Removed some useless static libraries
* Upgraded packages to match the book
* Increased vermosity when unmounting filesystems
* Stopped stripping /tools
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2006-06-08 05:27:38 UTC (rev 1583)
+++ trunk/Makefile 2006-06-17 13:01:10 UTC (rev 1584)
@@ -24,8 +24,7 @@
# LFS-ARCH: architecture for which the CD should be built.
# MP: mount point
# timezone: default timezone
-# pagesize: paper size for groff.
-# In utf8-newmake branch, create /etc/papersize instead
+# pagesize: default paper size for groff.
# ROOT: name of this directory, as seen from chroot
# PM: Parallel Build Level
# HTTP: Default http server for the lfs-base packages
@@ -49,6 +48,7 @@
export LFSSRC := /lfs-sources
export PKG := packages
export MKTREE := $(MP)$(ROOT)
+export CONFIG_SITE := $(ROOT)/scripts/config.site
ROOTFS_MEGS := 1536
@@ -112,11 +112,11 @@
# This target populates the root.ext2 image and sets up some mounts
# Basically, replaces the prep-chroot and createdirs targets
-$(MP)$(ROOT): root.ext2
+$(MKTREE): root.ext2
mkdir -p $(MP) $(MPBASE)$(SRC) $(MPBASE)$(WD)/bin $(MPBASE)/iso/boot
mount -o loop root.ext2 $(MP)
-rm $(MP)/boot
- mkdir -p $(MP)$(ROOT) $(MP)$(SRC) $(MP)$(WD) $(MP)/boot
+ mkdir -p $(MKTREE) $(MP)$(SRC) $(MP)$(WD) $(MP)/boot
mount --bind $(MPBASE)$(ROOT) $(MP)$(ROOT)
mount --bind $(MPBASE)$(WD) $(MP)$(WD)
mount --bind $(MPBASE)$(SRC) $(MP)$(SRC)
@@ -157,7 +157,6 @@
-mknod -m 666 $(MP)/dev/tty c 5 0
-mknod -m 444 $(MP)/dev/random c 1 8
-mknod -m 444 $(MP)/dev/urandom c 1 9
- # No chown because this will not affect the permissions in any way.
-ln -s /proc/self/fd $(MP)/dev/fd
-ln -s /proc/self/fd/0 $(MP)/dev/stdin
-ln -s /proc/self/fd/1 $(MP)/dev/stdout
@@ -166,8 +165,7 @@
# This target builds just a base LFS system, minus the kernel and bootscripts
#==============================================================================
-lfs-base: $(MP)$(ROOT) lfsuser
- @-make unamemod
+lfs-base: $(MKTREE) lfsuser
@-chown -R lfs $(WD) $(MP)$(WD) $(WD)/bin \
$(LFSSRC) $(MP)$(LFSSRC) $(SRC) $(MP)$(SRC) $(MKTREE)
@cp $(ROOT)/scripts/unpack $(WD)/bin
@@ -185,14 +183,14 @@
stop-here:
exit 1
-extend-lfs: $(MP)$(ROOT)
+extend-lfs: $(MKTREE)
@cp $(WD)/bin/which $(MP)/usr/bin
@cp $(ROOT)/scripts/unpack $(MP)/bin
@chroot "$(MP)" $(chenv-blfs) 'set +h && cd $(ROOT) && \
make blfs $(chbash-post-bash)'
@install -m644 etc/issue $(MP)/etc/issue
-extend-minimal: $(MP)$(ROOT)
+extend-minimal: $(MKTREE)
@cp $(WD)/bin/which $(MP)/usr/bin
@cp $(ROOT)/scripts/unpack $(MP)/bin
@chroot "$(MP)" $(chenv-blfs) 'set +h && cd $(ROOT) && \
@@ -215,10 +213,6 @@
@make -C $(PKG)/wget prebuild
@touch $@
-unamemod:
- @install -m 755 uname/uname $(WD)/bin/
- @touch $@
-
tools: pre-which pre-wget lfs-binutils-pass1 lfs-gcc-pass1 \
lfs-linux-libc-headers-scpt lfs-glibc-scpt lfs-adjust-toolchain \
lfs-tcl-scpt lfs-expect-scpt lfs-dejagnu-scpt lfs-gcc-pass2 \
@@ -226,8 +220,7 @@
lfs-coreutils-scpt lfs-diffutils-scpt lfs-findutils-scpt \
lfs-gawk-scpt lfs-gettext-scpt lfs-grep-scpt lfs-gzip-scpt \
lfs-m4-scpt lfs-make-scpt lfs-patch-scpt lfs-perl-scpt lfs-sed-scpt \
- lfs-tar-scpt lfs-texinfo-scpt lfs-util-linux-scpt lfs-wget-scpt \
- lfs-strip
+ lfs-tar-scpt lfs-texinfo-scpt lfs-util-linux-scpt lfs-wget-scpt
@cp /etc/resolv.conf $(WD)/etc
pre-bash: createfiles ch-linux-libc-headers ch-man-pages \
@@ -305,21 +298,21 @@
#==============================================================================
# The following takes the form 'make lfs-[package name]-only'
-lfs-%-only: unamemod lfsuser
+lfs-%-only: lfsuser
@su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-$*-scpt'"
# The following two take the form 'make lfs-[package name]-only-pass#'
-lfs-%-only-pass1: unamemod lfsuser
+lfs-%-only-pass1: lfsuser
@su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-$*-pass1'"
-lfs-%-only-pass2: unamemod lfsuser
+lfs-%-only-pass2: lfsuser
@su - lfs -c "$(lfsenv) '$(lfsbash) && $(MAKE) lfs-$*-pass2'"
# The following takes the form 'make [package name]-only-ch'
-%-only-ch: $(MP)$(ROOT)
+%-only-ch: $(MKTREE)
make -C $(PKG)/$* chroot
-gvim: $(MP)$(ROOT)
+gvim: $(MKTREE)
make -C $(PKG)/vim chroot3
# The following takes the form 'make [package name]-clean'
@@ -358,12 +351,6 @@
lfs-adjust-toolchain:
$(MAKE) -C $(PKG)/binutils adjust-toolchain
-lfs-strip:
- @-strip --strip-debug $(WD)/lib/*
- @-strip --strip-unneeded $(WD)/{,s}bin/*
- @-rm -rf $(WD)/{doc,info,man}
- @touch $@
-
ch-%:
make -C $(PKG)/$* stage2
@@ -388,7 +375,7 @@
# Targets to create the iso
#==============================================================================
-prepiso: $(MP)$(ROOT)
+prepiso: $(MKTREE)
@-rm $(MP)/root/.bash_history
@>$(MP)/var/log/btmp
@>$(MP)/var/log/wtmp
@@ -434,8 +421,7 @@
@-userdel lfs
@-groupdel lfs
@-rm -rf /home/lfs
- @-rm {prepiso,lfsuser,unamemod,lfs-base,extend-lfs,lfs-strip,}
- @-rm {sqfs.log,lfs-strip,pre-wget}
+ @-rm {prepiso,lfsuser,lfs-base,extend-lfs,pre-wget}
@-rm $(PKG)/binutils/{,re-}adjust-toolchain
@-for i in `ls $(PKG)` ; do $(MAKE) -C $(PKG)/$$i clean ; done
@find $(PKG) -name "pass*" -exec rm -rf \{} \;
@@ -455,20 +441,20 @@
@find packages/* -xtype l -exec rm -f \{} \;
unmount:
- @-umount $(MP)/dev/shm
- @-umount $(MP)/dev/pts
- @-umount $(MP)/proc
- @-umount $(MP)/sys
- @-umount $(MP)/boot
- @-umount $(MP)$(SRC)
- @-umount $(MP)$(WD)
- @-umount $(MP)$(ROOT)
- @-rmdir $(MP)$(SRC) $(MP)$(WD) $(MP)$(ROOT)
- @-rmdir $(MP)/boot
- @-ln -s /dev/shm/.cdrom/boot $(MP)
- @-umount $(MP)
+ -umount $(MP)/dev/shm
+ -umount $(MP)/dev/pts
+ -umount $(MP)/proc
+ -umount $(MP)/sys
+ -umount $(MP)/boot
+ -umount $(MP)$(SRC)
+ -umount $(MP)$(WD)
+ -umount $(MP)$(ROOT)
+ -rmdir $(MP)$(SRC) $(MP)$(WD) $(MP)$(ROOT)
+ -rmdir $(MP)/boot
+ -ln -s /dev/shm/.cdrom/boot $(MP)
+ -umount $(MP)
-zeroes: $(MP)$(ROOT)
+zeroes: $(MKTREE)
-dd if=/dev/zero of=$(MP)/zeroes
-rm $(MP)/zeroes
-make unmount
Modified: trunk/packages/binutils/Makefile
===================================================================
--- trunk/packages/binutils/Makefile 2006-06-08 05:27:38 UTC (rev 1583)
+++ trunk/packages/binutils/Makefile 2006-06-17 13:01:10 UTC (rev 1584)
@@ -12,13 +12,15 @@
include $(ROOT)/scripts/functions
LINKER ?= ld-linux.so.2
+export LFS_USE_TARGET := yes
pass1: $(FILE)
$(sep_dir_build)
cp $(SRC)/$(FILE) $(LFSSRC)
compile-pass1:
- ../$(DIR)/configure --prefix=$(WD) --disable-nls
+# --disable-shared overrides unsuitable default from config.site
+ ../$(DIR)/configure --prefix=$(WD) --disable-nls --disable-shared
make $(PM)
make install
make -C ld clean
@@ -45,8 +47,9 @@
$(sep_dir_build)
compile-pass2:
+# --disable-shared overrides unsuitable default from config.site
../$(DIR)/configure --prefix=$(WD) --disable-nls \
- --with-lib-path=$(WD)/lib
+ --with-lib-path=$(WD)/lib --disable-shared
make $(PM)
make install
make -C ld clean
@@ -78,6 +81,7 @@
compile-stage2:
../$(DIR)/configure --prefix=/usr --enable-shared
make $(PM) tooldir=/usr
+ -make -k check
make tooldir=/usr install
cp ../$(DIR)/include/libiberty.h /usr/include
Modified: trunk/packages/bison/Makefile
===================================================================
--- trunk/packages/bison/Makefile 2006-06-08 05:27:38 UTC (rev 1583)
+++ trunk/packages/bison/Makefile 2006-06-17 13:01:10 UTC (rev 1584)
@@ -1,12 +1,12 @@
# Bison Makefile
NM= bison
-VRS= 2.1
+VRS= 2.2
DIR= $(NM)-$(VRS)
-FILE= $(DIR).tar.gz
+FILE= $(DIR).tar.bz2
URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= b236923e7d4909c6fd8873ac87431833fa45069b
+SHA-$(FILE)= b01691c83cc0d08d3c03e32c494f6b03381ecd21
# Targets
Modified: trunk/packages/coreutils/Makefile
===================================================================
--- trunk/packages/coreutils/Makefile 2006-06-08 05:27:38 UTC (rev 1583)
+++ trunk/packages/coreutils/Makefile 2006-06-17 13:01:10 UTC (rev 1584)
@@ -1,12 +1,12 @@
# Coreutils Makefile
NM= coreutils
-VRS= 5.94
+VRS= 5.96
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.bz2
URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= c39add02995304e1cf3dfc8543702f22155fba50
+SHA-$(FILE)= 782379daf200427058ca94a408566d600f779823
PATCH1= $(DIR)-uname-1.patch
URL-$(PATCH1)= $(HTTP)/$(NM)/$(PATCH1)
@@ -32,8 +32,6 @@
./configure --prefix=$(WD)
make $(PM)
make install
- mv $(WD)/bin/uname $(WD)/bin/uname.real
- install -m 755 $(MP)$(ROOT)/uname/uname $(WD)/bin/
chroot:
chroot "$(MP)" $(chenv-pre-bash) \
@@ -59,8 +57,6 @@
mv /usr/bin/{rmdir,stty,sync,true,uname} /bin
mv /usr/bin/chroot /usr/sbin
mv /usr/bin/{head,sleep} /bin
- mv /bin/uname /bin/uname.real
- install -m 755 ${ROOT}/uname/uname /bin/
clean:
-rm -rf $(DIR)
Modified: trunk/packages/diffutils/Makefile
===================================================================
--- trunk/packages/diffutils/Makefile 2006-06-08 05:27:38 UTC (rev 1583)
+++ trunk/packages/diffutils/Makefile 2006-06-17 13:01:10 UTC (rev 1584)
@@ -35,6 +35,7 @@
compile-stage2:
patch -Np1 -i ../$(PATCH50)
+ touch man/diff.1
./configure --prefix=/usr
make $(PM)
make install
Modified: trunk/packages/gcc/Makefile
===================================================================
--- trunk/packages/gcc/Makefile 2006-06-08 05:27:38 UTC (rev 1583)
+++ trunk/packages/gcc/Makefile 2006-06-17 13:01:10 UTC (rev 1584)
@@ -16,14 +16,17 @@
include $(ROOT)/scripts/functions
+export LFS_USE_TARGET := yes
+
pass1: $(FILE)
$(sep_dir_build)
cp $(SRC)/$(FILE) $(LFSSRC)/
compile-pass1:
+# --enable-static overrides the unsuitable default in config.site
../$(DIR)/configure --prefix=$(WD) \
--with-local-prefix=$(WD) --disable-nls --enable-shared \
- --enable-languages=c
+ --enable-languages=c --enable-static
make $(PM) bootstrap
make install
ln -s gcc $(WD)/bin/cc
@@ -39,10 +42,11 @@
sed 's/^XCFLAGS =$$/& -fomit-frame-pointer/' gcc/Makefile.in.tmp \
> gcc/Makefile.in
cd ../$(DIR) ; patch -Np1 -i ../$(PATCH1)
+# --enable-static overrides the unsuitable default in config.site
../$(DIR)/configure --prefix=$(WD) \
--with-local-prefix=$(WD) --enable-clocale=gnu --enable-shared \
--enable-threads=posix --enable-__cxa_atexit --enable-languages=c,c++ \
- --disable-libstdcxx-pch
+ --disable-libstdcxx-pch --enable-static
make $(PM)
make install
@@ -60,10 +64,12 @@
gcc/Makefile.in
cd ../$(DIR) ; sed -i '[EMAIL PROTECTED]/[EMAIL PROTECTED] true@'
gcc/Makefile.in
cd ../$(DIR) ; sed -i 's/@have_mktemp_command@/yes/' gcc/gccbug.in
+# --enable-static overrides the unsuitable default in config.site
../$(DIR)/configure --prefix=/usr --libexecdir=/usr/lib \
--enable-shared --enable-threads=posix --enable-__cxa_atexit \
- --enable-clocale=gnu --enable-languages=c,c++
+ --enable-clocale=gnu --enable-languages=c,c++ --enable-static
make $(PM)
+ -make -k check
make install
ln -sf ../usr/bin/cpp /lib
ln -sf gcc /usr/bin/cc
Modified: trunk/packages/glibc/Makefile
===================================================================
--- trunk/packages/glibc/Makefile 2006-06-08 05:27:38 UTC (rev 1583)
+++ trunk/packages/glibc/Makefile 2006-06-17 13:01:10 UTC (rev 1584)
@@ -28,9 +28,10 @@
cp $(SRC)/{$(FILE),$(FILE2)} $(LFSSRC)/
compile-stage1:
+# --enable-static overrides the unsuitable default in config.site
../$(DIR)/configure --prefix=$(WD) --disable-profile \
--enable-add-ons --enable-kernel=2.6.0 --with-binutils=$(WD)/bin \
- --without-gd --with-headers=$(WD)/include --without-selinux
+ --without-gd --with-headers=$(WD)/include --without-selinux
--enable-static
PARALLELMFLAGS="$(PM)" make
# LFS says:
# mkdir -v /tools/etc
@@ -59,9 +60,11 @@
../$(DIR)/scripts/test-installation.pl
# LiveCD specific locale additions
cd ../$(DIR) ; patch -Np1 -i ../$(PATCH50)
+# --enable-static overrides the unsuitable default in config.site
../$(DIR)/configure --prefix=/usr --disable-profile \
- --enable-add-ons --enable-kernel=2.6.0 --libexecdir=/usr/lib/glibc
+ --enable-add-ons --enable-kernel=2.6.0 --libexecdir=/usr/lib/glibc
--enable-static
PARALLELMFLAGS="$(PM)" make
+ -make -k check
touch /etc/ld.so.conf
PARALLELMFLAGS="$(PM)" make install
PARALLELMFLAGS="$(PM)" make localedata/install-locales
Modified: trunk/packages/iana-etc/Makefile
===================================================================
--- trunk/packages/iana-etc/Makefile 2006-06-08 05:27:38 UTC (rev 1583)
+++ trunk/packages/iana-etc/Makefile 2006-06-17 13:01:10 UTC (rev 1584)
@@ -1,12 +1,12 @@
# Iana-etc Makefile
NM= iana-etc
-VRS= 2.00
+VRS= 2.10
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.bz2
URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= e4d9efb9076b8b18dc7add2236c68230a19b2607
+SHA-$(FILE)= 6a2960e42ccf3266680b7adb83f239c5a640220e
# Targets
Modified: trunk/packages/man-pages/Makefile
===================================================================
--- trunk/packages/man-pages/Makefile 2006-06-08 05:27:38 UTC (rev 1583)
+++ trunk/packages/man-pages/Makefile 2006-06-17 13:01:10 UTC (rev 1584)
@@ -1,12 +1,12 @@
# Man-pages Makefile
NM= man-pages
-VRS= 2.21
+VRS= 2.33
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.bz2
URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 36e50c9058d30244afa70e6622baea32ded258a2
+SHA-$(FILE)= dcbcaabdd8d0508b8ca6a766040e35a828680c75
# Targets
Modified: trunk/packages/ncurses/Makefile
===================================================================
--- trunk/packages/ncurses/Makefile 2006-06-08 05:27:38 UTC (rev 1583)
+++ trunk/packages/ncurses/Makefile 2006-06-17 13:01:10 UTC (rev 1584)
@@ -21,8 +21,8 @@
cp $(SRC)/$(FILE) $(LFSSRC)
compile-stage1:
- ./configure --prefix=$(WD) --with-shared --without-debug \
- --without-ada --enable-overwrite
+ ./configure --prefix=$(WD) --with-shared --without-normal \
+ --without-debug --without-ada --enable-overwrite --without-cxx-binding
make
make install
@@ -38,7 +38,7 @@
# And nothing on the CD uses the C++ binding
compile-stage2:
patch -Np1 -i ../$(PATCH50)
- ./configure --prefix=/usr --with-shared \
+ ./configure --prefix=/usr --with-shared --without-normal \
--without-debug --enable-widec --without-cxx-binding
make
make install
@@ -46,14 +46,10 @@
mv /usr/lib/libncursesw.so.5* /lib
ln -sfv ../../lib/libncursesw.so.5 /usr/lib/libncursesw.so
for lib in curses ncurses form panel menu ; do \
- rm -vf /usr/lib/lib$${lib}.so ; \
echo "INPUT(-l$${lib}w)" >/usr/lib/lib$${lib}.so ; \
- ln -svf lib$${lib}w.a /usr/lib/lib$${lib}.a ; \
done
echo "INPUT(-lncursesw)" >/usr/lib/libcursesw.so
ln -svf libncurses.so /usr/lib/libcurses.so
- ln -svf libncursesw.a /usr/lib/libcursesw.a
- ln -svf libncurses.a /usr/lib/libcurses.a
clean:
-rm -rf $(DIR)
Modified: trunk/packages/perl/Makefile
===================================================================
--- trunk/packages/perl/Makefile 2006-06-08 05:27:38 UTC (rev 1583)
+++ trunk/packages/perl/Makefile 2006-06-17 13:01:10 UTC (rev 1584)
@@ -24,7 +24,9 @@
compile-stage1:
patch -Np1 -i ../$(PATCH1)
- ./configure.gnu --prefix=$(WD) -Dstatic_ext='Data/Dumper Fcntl IO
POSIX' \
+ ./configure.gnu --prefix=$(WD) \
+ -Dstatic_ext='Data/Dumper Fcntl IO POSIX' \
+ -Darchname=$${LFS_TARGET%%-*}-linux \
$(EXTRA_CONF)
make perl utilities
cp perl pod/pod2man $(WD)/bin
@@ -42,7 +44,9 @@
./configure.gnu --prefix=/usr \
-Dman1dir=/usr/share/man/man1 \
-Dman1dir=/usr/share/man/man1 \
- -Dpager="/usr/bin/less -isR"
+ -Dpager="/usr/bin/less -isR" \
+ -Duseshrplib=true \
+ -Darchname=$${LFS_TARGET%%-*}-linux
make
make install
Modified: trunk/packages/readline/Makefile
===================================================================
--- trunk/packages/readline/Makefile 2006-06-08 05:27:38 UTC (rev 1583)
+++ trunk/packages/readline/Makefile 2006-06-17 13:01:10 UTC (rev 1584)
@@ -25,7 +25,6 @@
make $(PM) SHLIB_LIBS=-lncurses
make install
chmod 755 /lib/lib{readline,history}.so*
- mv /lib/lib{readline,history}.a /usr/lib
rm /lib/lib{readline,history}.so
ln -sf ../../lib/libreadline.so.5 /usr/lib/libreadline.so
ln -sf ../../lib/libhistory.so.5 /usr/lib/libhistory.so
Modified: trunk/packages/tcl/Makefile
===================================================================
--- trunk/packages/tcl/Makefile 2006-06-08 05:27:38 UTC (rev 1583)
+++ trunk/packages/tcl/Makefile 2006-06-17 13:01:10 UTC (rev 1584)
@@ -1,12 +1,12 @@
# Tcl Makefile
NM= tcl
-VRS= 8.4.12
+VRS= 8.4.13
DIR= $(NM)$(VRS)
FILE= $(DIR)-src.tar.gz
URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 8f9808da2df0aeb2319ab10a4fc49295789fc43d
+SHA-$(FILE)= 4af6bec9a941d7d798df4287eebece7ded67489c
# Targets
@@ -17,7 +17,6 @@
cp $(SRC)/$(FILE) $(LFSSRC)/
compile-stage1:
- cd unix ; cp configure configure.orig ; sed "s/relid'/relid/"
configure.orig >configure
cd unix ; ./configure --prefix=$(WD)
cd unix ; make $(PM)
cd unix ; make install
Modified: trunk/packages/udev/Makefile
===================================================================
--- trunk/packages/udev/Makefile 2006-06-08 05:27:38 UTC (rev 1583)
+++ trunk/packages/udev/Makefile 2006-06-17 13:01:10 UTC (rev 1584)
@@ -1,18 +1,18 @@
# Udev Makefile
NM= udev
-VRS= 091
-CONFVRS= 20060502-try2
+VRS= 092
+CONFVRS= 20060515
DIR= $(NM)-$(VRS)
CONFDIR=$(NM)-config-$(CONFVRS)
FILE= $(DIR).tar.bz2
-URL-$(FILE)= http://www.kernel.org/pub/linux/utils/kernel/hotplug/$(FILE)
-SHA-$(FILE)= d6c9ad0fd86df80f5e6228ce529de1a2c1427a85
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
+SHA-$(FILE)= d512e18d4f3a6f89b0d28bbba6510aa81e63d895
CONFIG1= $(CONFDIR).tar.bz2
URL-$(CONFIG1)= http://downloads.linuxfromscratch.org/$(CONFIG1)
-SHA-$(CONFIG1)= 55690045db2d3cf70f5e46e11846494b6ccd33dc
+SHA-$(CONFIG1)= f02c1d2b56e42a26a5650be0434a6c76ddb21f14
# Targets
Modified: trunk/scripts/config.site
===================================================================
--- trunk/scripts/config.site 2006-06-08 05:27:38 UTC (rev 1583)
+++ trunk/scripts/config.site 2006-06-17 13:01:10 UTC (rev 1584)
@@ -1,29 +1,17 @@
#!/bin/sh
-# This file is not used for now and kept only for history
+test "$mandir" = '${prefix}/man' && mandir='${prefix}/share/man'
+test "$infodir" = '${prefix}/info' && infodir='${prefix}/share/info'
-test "$prefix" = NONE && prefix=/usr
+build=${LFS_TARGET}
+host=${LFS_TARGET}
+build_alias=${LFS_TARGET}
+host_alias=${LFS_TARGET}
-if [ ${CROSS} = "yes" ]
-then
- case "$prefix" in
- /cross-tools)
- host=${LFS_HOST}
- target=${LFS_TARGET}
- ;;
- /tools)
- # On IRC, Jim confirmed that always adding --build is harmless
- build=${LFS_HOST}
- host=${LFS_TARGET}
- ;;
- esac
+if [ "$LFS_USE_TARGET" = "yes" ] ; then
+ target=${LFS_TARGET}
+ target_alias=${LFS_TARGET}
fi
-test "$mandir" = '${prefix}/man' && mandir='${prefix}/share/man'
-test "$infodir" = '${prefix}/info' && infodir='${prefix}/share/info'
-test "$libdir" = NONE && libdir='${prefix}'/${LIB_MAYBE64}
-test -z "$CFLAGS" && CFLAGS="-Os -s -pipe"
-test -z "$CXXFLAGS" && CXXFLAGS=${CFLAGS}
-
-test "$prefix" != /cross-tools && test -z "$CC" && CC="gcc ${BUILD64}"
-test "$prefix" != /cross-tools && test -z "$CXX" && CXX="g++ ${BUILD64}"
+enable_static=${enable_static:-no}
+enable_shared=${enable_shared:-yes}
Modified: trunk/vars/vars.ppc
===================================================================
--- trunk/vars/vars.ppc 2006-06-08 05:27:38 UTC (rev 1583)
+++ trunk/vars/vars.ppc 2006-06-17 13:01:10 UTC (rev 1584)
@@ -1,3 +1,4 @@
export VERSION := ppc-6.2-pre2
-export CFLAGS := -Os -s
+export CFLAGS := -Os -s -fno-strict-aliasing
export LINKER := ld.so.1
+export LFS_TARGET := powerpc-unknown-linux-gnu
Modified: trunk/vars/vars.sparc
===================================================================
--- trunk/vars/vars.sparc 2006-06-08 05:27:38 UTC (rev 1583)
+++ trunk/vars/vars.sparc 2006-06-17 13:01:10 UTC (rev 1584)
@@ -1,2 +1,3 @@
export VERSION := sparc-6.2-pre1
-export CFLAGS := -Os -s
+export CFLAGS := -Os -s -fno-strict-aliasing
+export LFS_TARGET := sparc-unknown-linux-gnu
Modified: trunk/vars/vars.x86
===================================================================
--- trunk/vars/vars.x86 2006-06-08 05:27:38 UTC (rev 1583)
+++ trunk/vars/vars.x86 2006-06-17 13:01:10 UTC (rev 1584)
@@ -1,3 +1,4 @@
-export VERSION := x86-6.2-pre4
-export CFLAGS := -Os -s -march=i486
+export VERSION := x86-6.2-pre5
+export CFLAGS := -Os -s -fno-strict-aliasing -mtune=i686
export LINKER := ld-linux.so.2
+export LFS_TARGET := i486-pc-linux-gnu
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
