r1778 - in trunk: doc etc packages/jhalfs packages/sudo

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Sun Dec 10 04:50:45 PST 2006


Author: alexander
Date: 2006-12-10 05:50:44 -0700 (Sun, 10 Dec 2006)
New Revision: 1778

Added:
   trunk/packages/jhalfs/configuration
Modified:
   trunk/doc/README
   trunk/etc/group
   trunk/etc/passwd
   trunk/packages/jhalfs/Makefile
   trunk/packages/sudo/Makefile
Log:
Merged jhalfs update from the 6.2 branch

Modified: trunk/doc/README
===================================================================
--- trunk/doc/README	2006-12-10 10:53:17 UTC (rev 1777)
+++ trunk/doc/README	2006-12-10 12:50:44 UTC (rev 1778)
@@ -69,25 +69,6 @@
 (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.)
 
-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
 ===========================
 The LiveCD attempts to detect the network cards present in the system.
@@ -338,6 +319,21 @@
 On the second boot (i.e., after hibernating), this "echo" command will restore
 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
 ===========================
 Many thanks to all whose suggestions, support and hard work have helped create

Modified: trunk/etc/group
===================================================================
--- trunk/etc/group	2006-12-10 10:53:17 UTC (rev 1777)
+++ trunk/etc/group	2006-12-10 12:50:44 UTC (rev 1778)
@@ -18,3 +18,4 @@
 rsyncd:x:48:
 sshd:x:50:
 nogroup:x:99:
+jhalfs:x:101:

Modified: trunk/etc/passwd
===================================================================
--- trunk/etc/passwd	2006-12-10 10:53:17 UTC (rev 1777)
+++ trunk/etc/passwd	2006-12-10 12:50:44 UTC (rev 1778)
@@ -2,3 +2,4 @@
 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
+jhalfs:x:101:101:jhalfs:/home/jhalfs:/bin/bash

Modified: trunk/packages/jhalfs/Makefile
===================================================================
--- trunk/packages/jhalfs/Makefile	2006-12-10 10:53:17 UTC (rev 1777)
+++ trunk/packages/jhalfs/Makefile	2006-12-10 12:50:44 UTC (rev 1778)
@@ -1,13 +1,14 @@
 # jhalfs Makefile
 
 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
 
 include $(ROOT)/scripts/functions
@@ -16,12 +17,15 @@
 	chroot "$(MP)" $(chenv-blfs) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-stage2: Makefile $(FILE)
-	$(std_build)
+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 $@
 
-compile-stage2:
-	cp -av . /root/$(DIR)
-
 clean:
 	-rm -rf $(DIR)
 

Copied: trunk/packages/jhalfs/configuration (from rev 1777, branches/6.2/packages/jhalfs/configuration)
===================================================================
--- trunk/packages/jhalfs/configuration	                        (rev 0)
+++ trunk/packages/jhalfs/configuration	2006-12-10 12:50:44 UTC (rev 1778)
@@ -0,0 +1,136 @@
+#
+# Automatically generated configuration: don't edit
+# use make menuconfig or make config to make changes
+#
+
+#
+# --- BOOK Settings
+#
+BOOK_LFS=y
+# BOOK_CLFS is not set
+# BOOK_CLFS2 is not set
+# BOOK_CLFS3 is not set
+# BOOK_HLFS is not set
+# BOOK_BLFS is not set
+PROGNAME="lfs"
+RUN_ME="./jhalfs run"
+# relSVN is not set
+WORKING_COPY=y
+# BRANCH is not set
+BRANCH_ID=""
+BOOK="/usr/share/LFS-BOOK-SVN-XML"
+# ARCH_X86 is not set
+# ARCH_MIPS is not set
+# ARCH_PPC is not set
+# ARCH_SPARC is not set
+# ARCH_ALPHA is not set
+# ARCH_ARM is not set
+# DATA_32 is not set
+# DATA_64 is not set
+# DATA_MULTI is not set
+# PROC_i486 is not set
+# PROC_i586 is not set
+# PROC_i686 is not set
+# PROC_mipsel is not set
+# PROC_mips is not set
+TARGET=""
+TARGET32=""
+ARCH=""
+MIPS_LEVEL=""
+ABI=""
+# BUILD_CHROOT is not set
+# BUILD_BOOT is not set
+METHOD=""
+BOOT_CONFIG=""
+# GRSECURITY_HOST is not set
+# LIB_GLIBC is not set
+# LIB_UCLIBC is not set
+MODEL=""
+# CUSTOM_TOOLS is not set
+# BLFS_TOOL is not set
+# BLFS_SVN is not set
+# BLFS_BRANCH is not set
+BLFS_BRANCH_ID=""
+# DEP_LIBXML is not set
+# DEP_LIBXSLT is not set
+# DEP_TIDY is not set
+# DEP_DBXML is not set
+# DEP_UNZIP is not set
+# DEP_DBXSL is not set
+# DEP_LINKS is not set
+# DEP_SUDO is not set
+# DEP_WGET is not set
+# DEP_SVN is not set
+# DEP_GPM is not set
+BLFS_ROOT=""
+BLFS_XML=""
+TRACKING_DIR=""
+
+#
+# --- General Settings
+#
+# CONFIG_USER is not set
+DEF_USER="lfs"
+SET_USER=""
+# CONFIG_GROUP is not set
+SET_GROUP=""
+LUSER="lfs"
+LGROUP="lfs"
+BUILDDIR="/mnt/build_dir"
+GETPKG=y
+SRC_ARCHIVE="/lfs-sources"
+SERVER="http://ftp.lfs-matrix.net/"
+GETKERNEL=y
+RUNMAKE=y
+# CLEAN is not set
+
+#
+# --- Build Settings
+#
+CONFIG_TESTS=y
+TST_1=y
+# TST_2 is not set
+# TST_3 is not set
+TEST=1
+NO_BOMB=y
+# BOMB is not set
+# BOMB_TEST is not set
+# HAVE_FSTAB is not set
+FSTAB=""
+# CONFIG_BUILD_KERNEL is not set
+CONFIG=""
+STRIP=y
+VIMLANG=y
+TIMEZONE="GMT"
+LANG="$LANG"
+LC_ALL=""
+PAGE_LETTER=y
+# PAGE_A4 is not set
+PAGE="letter"
+
+#
+# --- Advanced Features
+#
+REPORT=y
+# COMPARE is not set
+ITERATIONS=0
+# RUN_ICA is not set
+# RUN_FARCE is not set
+# CONFIG_OPTIMIZE is not set
+# OPT_1 is not set
+# OPT_2 is not set
+OPTIMIZE=0
+
+#
+# --- Internal Settings (WARNING: for jhalfs developers only)
+#
+SCRIPT_ROOT="jhalfs"
+JHALFSDIR="$BUILDDIR/$SCRIPT_ROOT"
+LOGDIR="$JHALFSDIR/logs"
+TESTLOGDIR="$JHALFSDIR/test-logs"
+ICALOGDIR="$LOGDIR/ICA"
+FARCELOGDIR="$LOGDIR/farce"
+MKFILE="$JHALFSDIR/Makefile"
+XSL="$PROGNAME.xsl"
+PKG_LST="unpacked"
+# REBUILD_MAKEFILE is not set

Modified: trunk/packages/sudo/Makefile
===================================================================
--- trunk/packages/sudo/Makefile	2006-12-10 10:53:17 UTC (rev 1777)
+++ trunk/packages/sudo/Makefile	2006-12-10 12:50:44 UTC (rev 1778)
@@ -29,6 +29,8 @@
 	 --enable-noargs-shell --with-ignore-dot --with-all-insults \
 	 --enable-shell-sets-home
 	make
+	rm -f /etc/sudoers
+	echo 'jhalfs    ALL=(ALL) NOPASSWD:ALL' >>sudoers
 	env -i PATH=$$PATH make install
 
 clean:




More information about the livecd mailing list