Author: justin
Date: 2005-11-22 09:50:57 -0700 (Tue, 22 Nov 2005)
New Revision: 1147
Added:
branches/utf8-newmake/packages/jhalfs/
branches/utf8-newmake/packages/sudo/
branches/utf8-newmake/rsync/
Modified:
branches/utf8-newmake/Makefile
branches/utf8-newmake/doc/README
branches/utf8-newmake/etc/group
branches/utf8-newmake/etc/passwd
branches/utf8-newmake/packages/blfs-bootscripts/Makefile
branches/utf8-newmake/packages/gc/Makefile
branches/utf8-newmake/scripts/functions
Log:
Merged 1128, 1135, 1136, 1139, 1142, 1143 and 1144 from trunk to utf8-newmake.
This changes documentation install for gc, adds rsync, jhalfs and sudo, updates
the README and removes unneeded OK function.
Modified: branches/utf8-newmake/Makefile
===================================================================
--- branches/utf8-newmake/Makefile 2005-11-22 16:31:21 UTC (rev 1146)
+++ branches/utf8-newmake/Makefile 2005-11-22 16:50:57 UTC (rev 1147)
@@ -274,7 +274,7 @@
ch-startup-notification ch-vim ch-xfce ch-vte ch-exo ch-XML-Parser \
ch-Terminal ch-lua ch-ion ch-irssi \
ch-xchat ch-wireless_tools ch-tcpwrappers ch-portmap ch-nfs-utils \
- ch-traceroute \
+ ch-traceroute ch-rsync ch-jhalfs ch-sudo \
ch-ncftp ch-pciutils ch-nALFS ch-device-mapper ch-LVM2 \
ch-dhcpcd ch-distcc ch-ppp ch-rp-pppoe ch-libaal ch-reiser4progs \
ch-squashfs ch-cpio ch-gdbm ch-mutt ch-msmtp ch-tin ch-mdadm ch-which \
Modified: branches/utf8-newmake/doc/README
===================================================================
--- branches/utf8-newmake/doc/README 2005-11-22 16:31:21 UTC (rev 1146)
+++ branches/utf8-newmake/doc/README 2005-11-22 16:50:57 UTC (rev 1147)
@@ -39,6 +39,7 @@
* dhcpcd
* ncftp
* traceroute
+* rsync
Filesystem Programs
* e2fsprogs
@@ -64,6 +65,10 @@
nALFS & ALFS profile for LFS 6.1
(A tool for automating a Linux From Scratch installation)
+jhalfs
+(A tool for extracting commands from the Linux From Scratch book and creating
+Makefiles that can download, check and build each LFS package for you.)
+
CONFIGURING X
===========================
The Live CD attempts to configure X for your video card automatically. The
Modified: branches/utf8-newmake/etc/group
===================================================================
--- branches/utf8-newmake/etc/group 2005-11-22 16:31:21 UTC (rev 1146)
+++ branches/utf8-newmake/etc/group 2005-11-22 16:50:57 UTC (rev 1147)
@@ -15,4 +15,6 @@
usb:x:14:
cdrom:x:15:
mail:x:34:
+rsyncd:x:48:
+sshd:x:50:
nogroup:x:99:
Modified: branches/utf8-newmake/etc/passwd
===================================================================
--- branches/utf8-newmake/etc/passwd 2005-11-22 16:31:21 UTC (rev 1146)
+++ branches/utf8-newmake/etc/passwd 2005-11-22 16:50:57 UTC (rev 1147)
@@ -1,3 +1,4 @@
root:x:0:0:root:/root:/bin/bash
+rsyncd:x:48:48:rsyncd:/home/rsync:/bin/false
sshd:x:50:50:sshd:/var/lib/sshd:/bin/false
nobody:x:99:99:nobody:/dev/null:/bin/false
Modified: branches/utf8-newmake/packages/blfs-bootscripts/Makefile
===================================================================
--- branches/utf8-newmake/packages/blfs-bootscripts/Makefile 2005-11-22
16:31:21 UTC (rev 1146)
+++ branches/utf8-newmake/packages/blfs-bootscripts/Makefile 2005-11-22
16:50:57 UTC (rev 1147)
@@ -35,6 +35,7 @@
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/rsync /etc/rc.d/init.d/
clean:
-rm -rf $(DIR)
Modified: branches/utf8-newmake/packages/gc/Makefile
===================================================================
--- branches/utf8-newmake/packages/gc/Makefile 2005-11-22 16:31:21 UTC (rev
1146)
+++ branches/utf8-newmake/packages/gc/Makefile 2005-11-22 16:50:57 UTC (rev
1147)
@@ -16,13 +16,16 @@
chroot "$(MP)" $(chenv-blfs) \
'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
-stage2: Makefile $(FILE) $(PATCH1)
+stage2: Makefile $(FILE)
$(std_build)
compile-stage2:
- ./configure --prefix=/usr
+ sed -i "s|\$$(datadir)/@PACKAGE@|&-$(VRS)|" doc/Makefile.in
+ ./configure --prefix=/usr --datadir=/usr/share/doc --enable-cplusplus
make $(PM)
make install
+ install -v -m644 doc/gc.man /usr/share/man/man3/gc_malloc.3
+ ln -sf gc_malloc.3 /usr/share/man/man3/gc.3
clean:
-rm -rf $(DIR)
Copied: branches/utf8-newmake/packages/jhalfs (from rev 1136,
trunk/packages/jhalfs)
Copied: branches/utf8-newmake/packages/sudo (from rev 1144, trunk/packages/sudo)
Copied: branches/utf8-newmake/rsync (from rev 1141, trunk/packages/rsync)
Modified: branches/utf8-newmake/scripts/functions
===================================================================
--- branches/utf8-newmake/scripts/functions 2005-11-22 16:31:21 UTC (rev
1146)
+++ branches/utf8-newmake/scripts/functions 2005-11-22 16:50:57 UTC (rev
1147)
@@ -12,10 +12,6 @@
@echo
================================================================================$(WHITE)
endef
-define OK
- @echo $(GREEN)=====================================[ OK
]=====================================$(WHITE)
-endef
-
define std_build
@$(call echo_message, Building)
@unpack $(FILE) >$(DIR)[EMAIL PROTECTED] 2>&1
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
