Author: jhuntwork Date: 2005-04-18 09:50:11 -0600 (Mon, 18 Apr 2005) New Revision: 102
Modified: trunk/packages/Xorg/Makefile trunk/packages/bash/Makefile trunk/packages/docbook-xml/Makefile trunk/packages/firefox/firstrun trunk/packages/flex/Makefile trunk/packages/html_tidy/Makefile trunk/packages/openssh/Makefile trunk/packages/openssl/Makefile trunk/packages/sharutils/Makefile trunk/packages/sysklogd/Makefile trunk/packages/tar/Makefile trunk/packages/zip/Makefile Log: Tweaks to correct build failures Modified: trunk/packages/Xorg/Makefile =================================================================== --- trunk/packages/Xorg/Makefile 2005-04-18 02:29:23 UTC (rev 101) +++ trunk/packages/Xorg/Makefile 2005-04-18 15:50:11 UTC (rev 102) @@ -5,7 +5,7 @@ VRS= 6.8.2 DIR= xc FILE= X11R$(VRS)-src.tar.bz2 -PATCH= $(NM)-6.8.1-luit_race-1.patch +PATCH= xorg-6.8.1-luit_race-1.patch URL= http://xorg.freedesktop.org/X11R$(VRS)/src-single/$(FILE) URL1= http://www.linuxfromscratch.org/patches/downloads/xorg/$(PATCH) Modified: trunk/packages/bash/Makefile =================================================================== --- trunk/packages/bash/Makefile 2005-04-18 02:29:23 UTC (rev 101) +++ trunk/packages/bash/Makefile 2005-04-18 15:50:11 UTC (rev 102) @@ -45,7 +45,7 @@ @if [ ! -f /bin/bashbug ] ; then tar xjvf $(SRC)/$(FILE) && cd $(DIR) && \ patch -Np1 -i $(SRC)/$(PATCH2) && patch -Np1 -i $(SRC)/$(PATCH1) && \ ./configure --prefix=/usr --bindir=/bin --without-bash-malloc --with-installed-readline && \ - make && make install ; fi + make && rm /bin/bash && make install ; fi @make clean Modified: trunk/packages/docbook-xml/Makefile =================================================================== --- trunk/packages/docbook-xml/Makefile 2005-04-18 02:29:23 UTC (rev 101) +++ trunk/packages/docbook-xml/Makefile 2005-04-18 15:50:11 UTC (rev 102) @@ -5,7 +5,7 @@ VRS= 4.4 DIR= $(NM)-$(VRS) FILE= $(DIR).zip -URL= http://www.docbook.org/xml/4.3/$(FILE) +URL= http://www.docbook.org/xml/$(VRS)/$(FILE) Modified: trunk/packages/firefox/firstrun =================================================================== --- trunk/packages/firefox/firstrun 2005-04-18 02:29:23 UTC (rev 101) +++ trunk/packages/firefox/firstrun 2005-04-18 15:50:11 UTC (rev 102) @@ -7,8 +7,11 @@ mv ~/xorg.conf.new /etc/X11/xorg.conf fi -Xorg :3 & firefox --display=:3 -sleep 300 +echo "Sleeping for 90 seconds to allow Firefox's firstrun to complete" +sleep 90 PID=`pidof Xorg` -kill $PID +if [ $PID -gt 0 ] +then + kill $PID +fi Modified: trunk/packages/flex/Makefile =================================================================== --- trunk/packages/flex/Makefile 2005-04-18 02:29:23 UTC (rev 101) +++ trunk/packages/flex/Makefile 2005-04-18 15:50:11 UTC (rev 102) @@ -38,7 +38,7 @@ @if [ ! -f $(SRC)/$(PATCH) ] ; then $(WGET) $(URL1) && \ mv $(PATCH) $(SRC) ; fi @if [ ! -f /usr/bin/flex ] ; then tar xjvf $(SRC)/$(FILE) && cd $(DIR) && \ - patch -Np1 -i $(SRC)/$(PATCH) && touch doc/flex.1 && \ + patch -Z -Np1 -i $(SRC)/$(PATCH) && touch doc/flex.1 && \ ./configure --prefix=/usr && make -j3 && make install && \ ln -s libfl.a /usr/lib/libl.a && \ echo "#!/bin/sh" > /usr/bin/lex && \ Modified: trunk/packages/html_tidy/Makefile =================================================================== --- trunk/packages/html_tidy/Makefile 2005-04-18 02:29:23 UTC (rev 101) +++ trunk/packages/html_tidy/Makefile 2005-04-18 15:50:11 UTC (rev 102) @@ -2,12 +2,12 @@ # Package versions NM= tidy -VRS= 050321 +VRS= DIR= $(NM) -FILE= $(NM)_src_$(VRS).tgz -FILE2= $(NM)_docs.tgz +FILE= $(NM)_src.tgz +FILE1= $(NM)_docs.tgz URL= http://tidy.sourceforge.net/src/$(FILE) -URL2= http://tidy.sourceforge.net/docs/$(FILE2) +URL1= http://tidy.sourceforge.net/docs/$(FILE2) @@ -23,13 +23,12 @@ @echo "=====> Building $(NM) in chroot" @echo "" @if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi - @if [ ! -f $(FILE2) ] ; then $(WGET) $(URL2) ; fi + @if [ ! -f $(FILE2) ] ; then $(WGET) $(URL1) ; fi @if [ ! -f /usr/bin/tidy ] ; then tar xzvf $(FILE) && \ - tar xzvf $(FILE2) && cd $(DIR) && \ + tar xzvf $(FILE1) && cd $(DIR) && \ sh build/gnuauto/setup.sh && \ ./configure --prefix=/usr && \ make -j3 && make install && \ - install -m644 htmldoc/man_page.txt /usr/share/man/man1/tidy.1 && \ install -d -m755 /usr/share/doc/tidy && \ cp -R htmldoc /usr/share/doc/tidy && \ chown -R root:root /usr/share/doc/tidy ; fi Modified: trunk/packages/openssh/Makefile =================================================================== --- trunk/packages/openssh/Makefile 2005-04-18 02:29:23 UTC (rev 101) +++ trunk/packages/openssh/Makefile 2005-04-18 15:50:11 UTC (rev 102) @@ -20,13 +20,12 @@ @echo "=====> Building $(NM) in chroot" @echo "" @if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi - @if [ ! -d /var/empty ] ; then mkdir /var/empty ; fi @hostname $(HOSTNAME) @if [ ! -f /usr/bin/ssh ] ; then tar xzvf $(FILE) && cd $(DIR) && \ install -v -d -m700 /var/lib/sshd && \ chown root:sys /var/lib/sshd && \ groupadd sshd && \ - useradd -c 'sshd PrivSep' -d /var/lib/sshd -g sshd -s /bin/false sshd \ + useradd -c 'sshd PrivSep' -d /var/lib/sshd -g sshd -s /bin/false sshd && \ sed -i "s:-lcrypto:/usr/lib/libcrypto.a:g" configure && \ ./configure --prefix=/usr --sysconfdir=/etc/ssh --libexecdir=/usr/sbin --with-md5-passwords \ --with-privsep-path=/var/lib/sshd && \ Modified: trunk/packages/openssl/Makefile =================================================================== --- trunk/packages/openssl/Makefile 2005-04-18 02:29:23 UTC (rev 101) +++ trunk/packages/openssl/Makefile 2005-04-18 15:50:11 UTC (rev 102) @@ -5,8 +5,9 @@ VRS= 0.9.7f DIR= $(NM)-$(VRS) FILE= $(DIR).tar.gz -PATCH= http://www.linuxfromscratch.org/blfs/downloads/svn/openssl-0.9.7f-fix_manpages-1.patch +PATCH= $(DIR)-fix_manpages-1.patch URL= http://www.openssl.org/source/$(FILE) +URL1= http://www.linuxfromscratch.org/blfs/downloads/svn/$(PATCH) #RULES @@ -20,7 +21,7 @@ @echo "=====> Building $(NM) in chroot" @echo "" @if [ ! -f $(FILE) ] ; then $(WD)/bin/$(WGET) $(URL) ; fi - @if [ ! -f $(PATCH) ] ; then $(WD)/bin/$(WGET) $(URL) ; fi + @if [ ! -f $(PATCH) ] ; then $(WD)/bin/$(WGET) $(URL1) ; fi @if [ ! -d /etc/ssl ] ; then tar xzvf $(FILE) && cd $(DIR) && \ patch -Np1 -i ../$(PATCH) && \ ./config --openssldir=/etc/ssl --prefix=/usr shared && \ Modified: trunk/packages/sharutils/Makefile =================================================================== --- trunk/packages/sharutils/Makefile 2005-04-18 02:29:23 UTC (rev 101) +++ trunk/packages/sharutils/Makefile 2005-04-18 15:50:11 UTC (rev 102) @@ -20,7 +20,7 @@ @echo "" @if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \ mv $(FILE) $(SRC) ; fi - @if [ ! -f /usr/bin/clear ] ; then tar -xjvf $(SRC)/$(FILE) && \ + @if [ ! -f /usr/bin/clear ] ; then tar -xjvf $(SRC)/$(FILE) && cd $(DIR) && \ ./configure --prefix=/usr && \ make -j3 && \ make install ; fi Modified: trunk/packages/sysklogd/Makefile =================================================================== --- trunk/packages/sysklogd/Makefile 2005-04-18 02:29:23 UTC (rev 101) +++ trunk/packages/sysklogd/Makefile 2005-04-18 15:50:11 UTC (rev 102) @@ -2,7 +2,7 @@ # Package versions NM= sysklogd -VRS= 1.6.20 +VRS= 1.4.1 DIR= $(NM)-$(VRS) FILE= $(DIR).tar.bz2 PATCH=$(DIR)-fixes-1.patch @@ -22,10 +22,12 @@ @echo "" @if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \ mv $(FILE) $(SRC) ; fi - @if [ ! -d /etc/syslog-ng ] ; then tar xjvf $(SRC)/$(FILE) && cd $(DIR) && \ - patch -Np1 -i ../$(PATCH) && \ + @if [ ! -f $(SRC)/$(PATCH) ] ; then $(WGET) $(URL1) && \ + mv $(PATCH) $(SRC) ; fi + @if [ ! -f /etc/syslog.conf ] ; then tar xjvf $(SRC)/$(FILE) && cd $(DIR) && \ + patch -Np1 -i $(SRC)/$(PATCH) && \ make -j3 && make install && \ - cp -ra $(ROOT)/etc/syslog-ng /etc ; fi + cp -ra $(ROOT)/etc/syslog.conf /etc ; fi @make clean Modified: trunk/packages/tar/Makefile =================================================================== --- trunk/packages/tar/Makefile 2005-04-18 02:29:23 UTC (rev 101) +++ trunk/packages/tar/Makefile 2005-04-18 15:50:11 UTC (rev 102) @@ -32,7 +32,7 @@ @echo "" @if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \ mv $(FILE) $(SRC) ; fi - @if [ ! -f $(SRC)/$(PATCH) ] ; then $(WGET) $(URL) && \ + @if [ ! -f $(SRC)/$(PATCH) ] ; then $(WGET) $(URL1) && \ mv $(PATCH) $(SRC) ; fi @if [ ! -f /bin/tar ] ; then tar xjvf $(SRC)/$(FILE) && cd $(DIR) && \ patch -Np1 -i $(SRC)/$(PATCH) && \ Modified: trunk/packages/zip/Makefile =================================================================== --- trunk/packages/zip/Makefile 2005-04-18 02:29:23 UTC (rev 101) +++ trunk/packages/zip/Makefile 2005-04-18 15:50:11 UTC (rev 102) @@ -20,6 +20,7 @@ @echo "" @if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi @if [ ! -f /usr/bin/zip ] ; then tar xzvf $(FILE) && cd $(DIR) && \ + sed -i -e '[EMAIL PROTECTED](INSTALL) man/[EMAIL PROTECTED](INSTALL_PROGRAM) man/zip.1@' unix/Makefile && \ make prefix=/usr -f unix/Makefile generic_gcc && \ make prefix=/usr -f unix/Makefile install ; fi @make clean -- http://linuxfromscratch.org/mailman/listinfo/livecd FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
