diff options
| -rw-r--r-- | bootscripts/Makefile | 35 | ||||
| -rw-r--r-- | chapter01/changelog.xml | 9 | ||||
| -rw-r--r-- | general.ent | 4 | ||||
| -rw-r--r-- | packages.ent | 2 |
4 files changed, 32 insertions, 18 deletions
diff --git a/bootscripts/Makefile b/bootscripts/Makefile index f32217777..c293c3a77 100644 --- a/bootscripts/Makefile +++ b/bootscripts/Makefile @@ -1,7 +1,7 @@ -ETCDIR=/etc -EXTDIR=${DESTDIR}${ETCDIR} +EXTDIR=${DESTDIR}/etc LIBDIR=${DESTDIR}/lib/services -MAN8=/usr/share/man/man8 +MAN8=${DESTDIR}/usr/share/man/man8 +SBIN=${DESTDIR}/sbin MODE=754 DIRMODE=755 CONFMODE=644 @@ -47,8 +47,8 @@ files: create-dirs install -m ${MODE} lfs/init.d/template ${EXTDIR}/rc.d/init.d/ install -m ${MODE} lfs/init.d/udev ${EXTDIR}/rc.d/init.d/ install -m ${MODE} lfs/init.d/udev_retry ${EXTDIR}/rc.d/init.d/ - install -m ${MODE} lfs/sbin/ifup /sbin - install -m ${MODE} lfs/sbin/ifdown /sbin + install -m ${MODE} lfs/sbin/ifup ${SBIN} + install -m ${MODE} lfs/sbin/ifdown ${SBIN} install -m ${MODE} lfs/sbin/ifup.8 ${MAN8} ln -sf ifup.8 ${MAN8}/ifdown.8 install -m ${MODE} lfs/lib/services/ipv4-static-route ${LIBDIR} @@ -67,9 +67,9 @@ files: create-dirs install -m ${CONFMODE} lfs/sysconfig/rc.site ${EXTDIR}/sysconfig/ ;\ fi -links: files rcS rc0 rc1 rc2 rc3 rc4 rc5 rc6 +links: rcS rc0 rc1 rc2 rc3 rc4 rc5 rc6 -rcS: +rcS: files ln -sf ../init.d/mountvirtfs ${EXTDIR}/rc.d/rcS.d/S00mountvirtfs ln -sf ../init.d/consolelog ${EXTDIR}/rc.d/rcS.d/S02consolelog ln -sf ../init.d/modules ${EXTDIR}/rc.d/rcS.d/S05modules @@ -83,7 +83,7 @@ rcS: ln -sf ../init.d/console ${EXTDIR}/rc.d/rcS.d/S70console ln -sf ../init.d/sysctl ${EXTDIR}/rc.d/rcS.d/S90sysctl -rc0: +rc0: files ln -sf ../init.d/network ${EXTDIR}/rc.d/rc0.d/K80network ln -sf ../init.d/sysklogd ${EXTDIR}/rc.d/rc0.d/K90sysklogd ln -sf ../init.d/sendsignals ${EXTDIR}/rc.d/rc0.d/S60sendsignals @@ -92,27 +92,27 @@ rc0: ln -sf ../init.d/localnet ${EXTDIR}/rc.d/rc0.d/S90localnet ln -sf ../init.d/halt ${EXTDIR}/rc.d/rc0.d/S99halt -rc1: +rc1: files ln -sf ../init.d/network ${EXTDIR}/rc.d/rc1.d/K80network ln -sf ../init.d/sysklogd ${EXTDIR}/rc.d/rc1.d/K90sysklogd -rc2: +rc2: files ln -sf ../init.d/network ${EXTDIR}/rc.d/rc2.d/K80network ln -sf ../init.d/sysklogd ${EXTDIR}/rc.d/rc2.d/K90sysklogd -rc3: +rc3: files ln -sf ../init.d/sysklogd ${EXTDIR}/rc.d/rc3.d/S10sysklogd ln -sf ../init.d/network ${EXTDIR}/rc.d/rc3.d/S20network -rc4: +rc4: files ln -sf ../init.d/sysklogd ${EXTDIR}/rc.d/rc4.d/S10sysklogd ln -sf ../init.d/network ${EXTDIR}/rc.d/rc4.d/S20network -rc5: +rc5: files ln -sf ../init.d/sysklogd ${EXTDIR}/rc.d/rc5.d/S10sysklogd ln -sf ../init.d/network ${EXTDIR}/rc.d/rc5.d/S20network -rc6: +rc6: files ln -sf ../init.d/network ${EXTDIR}/rc.d/rc6.d/K80network ln -sf ../init.d/sysklogd ${EXTDIR}/rc.d/rc6.d/K90sysklogd ln -sf ../init.d/sendsignals ${EXTDIR}/rc.d/rc6.d/S60sendsignals @@ -121,5 +121,10 @@ rc6: ln -sf ../init.d/localnet ${EXTDIR}/rc.d/rc6.d/S90localnet ln -sf ../init.d/reboot ${EXTDIR}/rc.d/rc6.d/S99reboot -.PHONY: all create-dirs install files links rcS rc0 rc1 rc2 rc3 rc4 rc5 rc6 +uninstall: + rm -rf ${DESTDIR}/lib/services ${DESTDIR}/lib/lsb ${EXTDIR}/rc.d ${EXTDIR}/init.d \ + ${SBIN}/ifup ${SBIN}/ifdown ${MAN8}/ifup.8 ${MAN8}/ifdown.8 \ + ${EXTDIR}/sysconfig/rc + +.PHONY: all create-dirs install files links rcS rc0 rc1 rc2 rc3 rc4 rc5 rc6 uninstall diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 77b2ce711..0565ccb02 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -37,6 +37,15 @@ --> <listitem> + <para>2011-09-21</para> + <itemizedlist> + <listitem> + <para>[bdubbs] - Updates to lfs-bootscripts Makefile.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> <para>2011-09-18</para> <itemizedlist> <listitem> diff --git a/general.ent b/general.ent index 01d4d4662..dabf411b1 100644 --- a/general.ent +++ b/general.ent @@ -1,5 +1,5 @@ -<!ENTITY version "SVN-20110918"> -<!ENTITY releasedate "Sep 18, 2011"> +<!ENTITY version "SVN-20110921"> +<!ENTITY releasedate "Sep 21, 2011"> <!ENTITY copyrightdate "1999-2011"><!-- jhalfs needs a literal dash, not – --> <!ENTITY milestone "7.0"> <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" --> diff --git a/packages.ent b/packages.ent index a372bf421..b4ebcc6a1 100644 --- a/packages.ent +++ b/packages.ent @@ -298,7 +298,7 @@ <!ENTITY less-ch6-du "3.5 MB"> <!ENTITY less-ch6-sbu "less than 0.1 SBU"> -<!ENTITY lfs-bootscripts-version "20110918"> <!-- Scripts depend on this format --> +<!ENTITY lfs-bootscripts-version "20110921"> <!-- Scripts depend on this format --> <!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB"> <!-- Updated in Makefile --> <!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2"> <!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM"> <!-- Updated in Makefile --> |