Changeset 1778

Timestamp:

12/10/06 05:50:44 (2 years ago)

Author:

alexander

Message:

Merged jhalfs update from the 6.2 branch

Location:

trunk

Files:

• doc/README (modified) (2 diffs)
• etc/group (modified) (1 diff)
• etc/passwd (modified) (1 diff)
• packages/jhalfs/Makefile (modified) (2 diffs)
• packages/jhalfs/configuration (copied) (copied from branches/6.2/packages/jhalfs/configuration) (1 diff)
• packages/sudo/Makefile (modified) (1 diff)

trunk/doc/README

@@ -70 +70 @@
 Makefiles that can download, check and build each LFS package for you.)
 
-IMPORTANT NOTE ABOUT THE KERNEL
-===========================
-The LFS book recommends using "the latest available 2.6.16.x kernel version".
-At the time of the release of this CD, such version is 2.6.16.28. However,
-because of the way jhalfs works, the source for the 2.6.16.27 kernel
-must be present on the CD in order for jhalfs to be able to build a kernel.
-However, using jhalfs for building the kernel is acceptable only if
-you don't care about security.
-
-In order to get the 2.6.16.28 kernel from this CD, unpack the
-linux-2.6.16.27.tar.bz2 source tarball, and apply the upstream update patch:
-
-bzcat ../patch-2.6.16.27-28.bz2 | patch -Np1
-
-The patch-2.6.16.27-28.bz2 file is in the /lfs-sources directory.
-
-Further kernel updates may be available from
-http://www.kernel.org/pub/linux/kernel/v2.6/incr/
-
 CONFIGURING NET CONNECTION
 ===========================
@@ -339 +320 @@
 the computer state from the swap device.
 
+AUTOMATING THE BUILD
+===========================
+This CD comes with the "jhalfs" tool that allows extracting commands from the
+XML version of LFS or CLFS book into Makefiles and shell scripts. You can find
+the jhalfs installation in the home directory of the "jhalfs" user, and the
+XML LFS book is in /usr/share/LFS-BOOK-SVN-XML. In order to use jhalfs, you
+have to:
+
+* create a directory for your future LFS system and mount a partition there
+* change the ownership of that directory to the "jhalfs" user
+* run "su - jhalfs" in order to become that user
+* as user "jhalfs", follow the instructions in the jhalfs README file
+
+Note that this user already has the required sudo access.
+
 THANKS
 ===========================

trunk/etc/group

@@ -19 +19 @@
 sshd:x:50:
 nogroup:x:99:
+jhalfs:x:101:

trunk/etc/passwd

@@ -3 +3 @@
 sshd:x:50:50:sshd:/var/lib/sshd:/bin/false
 nobody:x:99:99:nobody:/dev/null:/bin/false
+jhalfs:x:101:101:jhalfs:/home/jhalfs:/bin/bash

trunk/packages/jhalfs/Makefile

@@ -2 +2 @@
 
 NM= jhalfs
-VRS= 1.0
+VRS= 2.1
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= http://www.linuxfromscratch.org/alfs/downloads/jhalfs/stable/$(FILE)
-SHA-$(FILE)= e153315fe642b76095356cccd22ea828b688a799
+SHA-$(FILE)= 41439fb254d7a2e28d5e2e592105077ad886b4dc
 
+FILE1= configuration
 # Targets
 
@@ -17 +18 @@
         'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-stage2: Makefile $(FILE)
-        $(std_build)
-
-compile-stage2:
-        cp -av . /root/$(DIR)
+stage2: Makefile $(FILE) $(FILE1)
+        @$(call echo_message, Building)
+        mkdir -p /home/jhalfs
+        cp -v $(ROOT)/root/.bashrc /home/jhalfs/.bashrc
+        cd /home/jhalfs ; unpack $(SRC)/$(FILE)
+        cp -v $(FILE1) /home/jhalfs/$(DIR)
+        chown -R jhalfs:jhalfs /home/jhalfs
+        @touch $@
 
 clean:

trunk/packages/jhalfs/configuration

@@ -19 +19 @@
 # BRANCH is not set
 BRANCH_ID=""
-BOOK="/usr/share/LFS-BOOK-6.2-XML"
+BOOK="/usr/share/LFS-BOOK-SVN-XML"
 # ARCH_X86 is not set
 # ARCH_MIPS is not set

trunk/packages/sudo/Makefile

@@ -30 +30 @@
          --enable-shell-sets-home
         make
+        rm -f /etc/sudoers
+        echo 'jhalfs    ALL=(ALL) NOPASSWD:ALL' >>sudoers
         env -i PATH=$$PATH make install