Author: alexander
Date: 2007-11-27 08:27:11 -0700 (Tue, 27 Nov 2007)
New Revision: 2139
Added:
branches/minimal/packages/jhalfs/jhalfs-2.3.1-locale-1.patch
Modified:
branches/minimal/packages/alsa-firmware/Makefile
branches/minimal/packages/blfs-bootscripts/Makefile
branches/minimal/packages/hibernate-script/Makefile
branches/minimal/packages/iptables/Makefile
branches/minimal/packages/jhalfs/Makefile
branches/minimal/packages/less/Makefile
branches/minimal/packages/linux32/Makefile
branches/minimal/packages/module-init-tools/Makefile
branches/minimal/packages/ncftp/Makefile
branches/minimal/packages/net-firmware/Makefile
branches/minimal/packages/subversion/Makefile
branches/minimal/packages/vim/Makefile
branches/minimal/packages/xfsprogs/Makefile
Log:
Merged all changes since r2130 from trunk
Modified: branches/minimal/packages/alsa-firmware/Makefile
===================================================================
--- branches/minimal/packages/alsa-firmware/Makefile 2007-11-27 14:17:20 UTC
(rev 2138)
+++ branches/minimal/packages/alsa-firmware/Makefile 2007-11-27 15:27:11 UTC
(rev 2139)
@@ -20,6 +20,7 @@
$(std_build)
compile-stage2:
+ sed -i s/multisound// Makefile.in
./configure --prefix=/usr --disable-loader
make
make install
Modified: branches/minimal/packages/blfs-bootscripts/Makefile
===================================================================
--- branches/minimal/packages/blfs-bootscripts/Makefile 2007-11-27 14:17:20 UTC
(rev 2138)
+++ branches/minimal/packages/blfs-bootscripts/Makefile 2007-11-27 15:27:11 UTC
(rev 2139)
@@ -34,7 +34,6 @@
install -m754 blfs/init.d/portmap /etc/rc.d/init.d/
install -m754 blfs/init.d/nfs-server /etc/rc.d/init.d/
install -m754 blfs/init.d/nfs-client /etc/rc.d/init.d/
- install -m754 blfs/init.d/iptables /etc/rc.d/init.d/
install -m754 blfs/init.d/rsyncd /etc/rc.d/init.d/
sed -i 's| --compress||' /etc/rc.d/init.d/rsyncd
Modified: branches/minimal/packages/hibernate-script/Makefile
===================================================================
--- branches/minimal/packages/hibernate-script/Makefile 2007-11-27 14:17:20 UTC
(rev 2138)
+++ branches/minimal/packages/hibernate-script/Makefile 2007-11-27 15:27:11 UTC
(rev 2139)
@@ -1,11 +1,12 @@
# hibernate-script Makefile
+# Do not update - new versions are buggy (call hooks more than once)
NM= hibernate-script
VRS= 1.91
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.gz
-URL-$(FILE)= http://at-mirror.suspend2.net/downloads/all/$(FILE)
+URL-$(FILE)= http://at-mirror.tuxonice.net/downloads/all/$(FILE)
SHA-$(FILE)= b81808f499068937a9696e977ef1cfd499d21eee
PATCH1=$(DIR)-lfs-3.patch
Modified: branches/minimal/packages/iptables/Makefile
===================================================================
--- branches/minimal/packages/iptables/Makefile 2007-11-27 14:17:20 UTC (rev
2138)
+++ branches/minimal/packages/iptables/Makefile 2007-11-27 15:27:11 UTC (rev
2139)
@@ -20,8 +20,10 @@
$(std_build)
compile-stage2:
- make PREFIX=/usr LIBDIR=/lib BINDIR=/bin MANDIR=/usr/share/man
KERNEL_DIR=/usr
- make PREFIX=/usr LIBDIR=/lib BINDIR=/bin MANDIR=/usr/share/man
KERNEL_DIR=/usr install
+ sed -i 's/name="$$node/name="node/' iptables.xslt
+ make PREFIX=/usr LIBDIR=/lib BINDIR=/sbin MANDIR=/usr/share/man
KERNEL_DIR=/usr
+ make PREFIX=/usr LIBDIR=/lib BINDIR=/sbin MANDIR=/usr/share/man
KERNEL_DIR=/usr install
+ install -v -m644 iptables.xslt /lib/iptables
clean:
-rm -rf $(DIR)
Modified: branches/minimal/packages/jhalfs/Makefile
===================================================================
--- branches/minimal/packages/jhalfs/Makefile 2007-11-27 14:17:20 UTC (rev
2138)
+++ branches/minimal/packages/jhalfs/Makefile 2007-11-27 15:27:11 UTC (rev
2139)
@@ -9,6 +9,8 @@
SHA-$(FILE)= 95a41e2e1c3ff01feaaefafeda7d187760a24dfe
FILE1= configuration
+
+PATCH1= jhalfs-2.3.1-locale-1.patch
# Targets
include $(ROOT)/scripts/functions
@@ -18,11 +20,14 @@
'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
stage2: Makefile $(FILE) $(FILE1)
- @$(call echo_message, Building)
+ $(std_build)
+
+compile-stage2:
+ patch -Np1 -i ../$(PATCH1)
+ cp ../$(FILE1) .
mkdir -p /home/jhalfs
cp -v $(ROOT)/root/.bashrc /home/jhalfs/.bashrc
- cd /home/jhalfs ; unpack $(SRC)/$(FILE)
- cp -v $(FILE1) /home/jhalfs/$(DIR)
+ cp -av . /home/jhalfs/$(DIR)
chown -R jhalfs:jhalfs /home/jhalfs
@touch $@
Copied: branches/minimal/packages/jhalfs/jhalfs-2.3.1-locale-1.patch (from rev
2138, trunk/packages/jhalfs/jhalfs-2.3.1-locale-1.patch)
===================================================================
--- branches/minimal/packages/jhalfs/jhalfs-2.3.1-locale-1.patch
(rev 0)
+++ branches/minimal/packages/jhalfs/jhalfs-2.3.1-locale-1.patch
2007-11-27 15:27:11 UTC (rev 2139)
@@ -0,0 +1,14 @@
+diff -urN jhalfs-2.3.1.orig/common/libs/func_check_version.sh
jhalfs-2.3.1/common/libs/func_check_version.sh
+--- jhalfs-2.3.1.orig/common/libs/func_check_version.sh 2007-08-02
22:47:23.000000000 +0600
++++ jhalfs-2.3.1/common/libs/func_check_version.sh 2007-11-07
20:13:10.000000000 +0500
+@@ -77,6 +77,10 @@
+ check_prerequisites() { #
+ #----------------------------#
+
++ # Avoid translation of version strings
++ local LC_ALL=C
++ export LC_ALL
++
+ # LFS/HLFS/CLFS prerequisites
+ check_version "2.6.2" "`uname -r`" "KERNEL"
+ check_version "3.0" "$BASH_VERSION" "BASH"
Modified: branches/minimal/packages/less/Makefile
===================================================================
--- branches/minimal/packages/less/Makefile 2007-11-27 14:17:20 UTC (rev
2138)
+++ branches/minimal/packages/less/Makefile 2007-11-27 15:27:11 UTC (rev
2139)
@@ -5,7 +5,7 @@
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.gz
-URL-$(FILE)= http://www.greenwoodsoftware.com/less/$(FILE)
+URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
SHA-$(FILE)= 7aeab848682c3ac7cd9ba54e4c96199f9fdf25e5
# Targets
Modified: branches/minimal/packages/linux32/Makefile
===================================================================
--- branches/minimal/packages/linux32/Makefile 2007-11-27 14:17:20 UTC (rev
2138)
+++ branches/minimal/packages/linux32/Makefile 2007-11-27 15:27:11 UTC (rev
2139)
@@ -18,7 +18,7 @@
install -m 755 linux32 /usr/bin
install -m644 linux32.1 /usr/share/man/man1
ln -sf linux32 /usr/bin/linux64
- ln -sf linux32 /usr/share/man/man1/linux64.1
+ ln -sf linux32.1 /usr/share/man/man1/linux64.1
clean:
rm -f linux32
Modified: branches/minimal/packages/module-init-tools/Makefile
===================================================================
--- branches/minimal/packages/module-init-tools/Makefile 2007-11-27
14:17:20 UTC (rev 2138)
+++ branches/minimal/packages/module-init-tools/Makefile 2007-11-27
15:27:11 UTC (rev 2139)
@@ -25,9 +25,9 @@
compile-stage2:
patch -Np1 -i ../$(PATCH1)
- ./configure --prefix=/ --enable-zlib
+ ./configure --prefix=/ --mandir=/usr/share/man --enable-zlib
make
- make install
+ make INSTALL=install install
install -m644 $(ROOT)/etc/modprobe.conf /etc/modprobe.conf
clean:
Modified: branches/minimal/packages/ncftp/Makefile
===================================================================
--- branches/minimal/packages/ncftp/Makefile 2007-11-27 14:17:20 UTC (rev
2138)
+++ branches/minimal/packages/ncftp/Makefile 2007-11-27 15:27:11 UTC (rev
2139)
@@ -5,7 +5,7 @@
DIR= $(NM)-$(VRS)
FILE= $(DIR)-src.tar.bz2
-URL-$(FILE)= http://ftp.belnet.be/pub/mirror/ftp.ncftp.com/ncftp/$(FILE)
+URL-$(FILE)=
http://ftp.belnet.be/mirror/ftp.ncftp.com/ncftp/older_versions/$(FILE)
SHA-$(FILE)= 708222170df81ed957e4f187213d69ea21e4f7dd
# Targets
Modified: branches/minimal/packages/net-firmware/Makefile
===================================================================
--- branches/minimal/packages/net-firmware/Makefile 2007-11-27 14:17:20 UTC
(rev 2138)
+++ branches/minimal/packages/net-firmware/Makefile 2007-11-27 15:27:11 UTC
(rev 2139)
@@ -75,12 +75,12 @@
DIR16= RT61_Firmware_V1.2
FILE16= $(DIR16).zip
URL-$(FILE16)= http://www.ralinktech.com.tw/data/$(FILE16)
-SHA-$(FILE16)= fded9f76ce620595b876b23b6a8c416af596dc5b
+SHA-$(FILE16)= 8a50899160d1ef1cd9770e4f0426930fb2b42a1b
DIR17= RT71W_Firmware_V1.8
FILE17= $(DIR17).zip
URL-$(FILE17)= http://www.ralinktech.com.tw/data/$(FILE17)
-SHA-$(FILE17)= 8f40bd8448c136e7edcc005f45e657258085ab8e
+SHA-$(FILE17)= 51541bec5cf2fe6ff46e46a0bb157b774d2ff050
DIR18= iwlwifi-3945-ucode-2.14.4
FILE18= $(DIR18).tgz
Modified: branches/minimal/packages/subversion/Makefile
===================================================================
--- branches/minimal/packages/subversion/Makefile 2007-11-27 14:17:20 UTC
(rev 2138)
+++ branches/minimal/packages/subversion/Makefile 2007-11-27 15:27:11 UTC
(rev 2139)
@@ -25,11 +25,11 @@
compile-stage2:
unpack ../$(FILE2) --strip-components=1
- ./configure --prefix=/usr --with-ssl \
+ unset VERSION ; ./configure --prefix=/usr --with-ssl \
--with-editor=/usr/bin/vim \
--with-installbuilddir=/usr/share/apr/build
- make
- make install
+ unset VERSION ; make
+ unset VERSION ; make install
install -v -d -m755 /usr/share/doc/$(DIR)
cp -v -R doc/* /usr/share/doc/$(DIR)
Modified: branches/minimal/packages/vim/Makefile
===================================================================
--- branches/minimal/packages/vim/Makefile 2007-11-27 14:17:20 UTC (rev
2138)
+++ branches/minimal/packages/vim/Makefile 2007-11-27 15:27:11 UTC (rev
2139)
@@ -64,7 +64,7 @@
ln -sfv vim /usr/bin/vi
for L in "" fr it pl ru ; do \
ln -sfv vim.1 /usr/share/man/$L/man1/vi.1 ; done
- ln -sfv ../vim/$(DIR)/doc /usr/share/doc/vim-$(VRS)
+ ln -nsfv ../vim/$(DIR)/doc /usr/share/doc/vim-$(VRS)
cp $(ROOT)/etc/vimrc /etc
clean:
Modified: branches/minimal/packages/xfsprogs/Makefile
===================================================================
--- branches/minimal/packages/xfsprogs/Makefile 2007-11-27 14:17:20 UTC (rev
2138)
+++ branches/minimal/packages/xfsprogs/Makefile 2007-11-27 15:27:11 UTC (rev
2139)
@@ -5,7 +5,7 @@
DIR= $(NM)-$(VRS)
FILE=$(NM)_$(VRS)-1.tar.gz
-URL-$(FILE)= ftp://oss.sgi.com/projects/xfs/cmd_tars/$(FILE)
+URL-$(FILE)= http://www.linuxfromscratch.org/~alexander/$(FILE)
SHA-$(FILE)= 79996d24faefa89d46eb678d4c1c08d25d20dec7
# Targets
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
