Author: jhuntwork
Date: 2007-07-29 11:29:09 -0600 (Sun, 29 Jul 2007)
New Revision: 1993
Modified:
branches/x86_64/packages/blfs-bootscripts/Makefile
branches/x86_64/packages/jhalfs/Makefile
branches/x86_64/packages/jhalfs/configuration
Log:
Merge r1990 and r1992 to x86_64 branch
Modified: branches/x86_64/packages/blfs-bootscripts/Makefile
===================================================================
--- branches/x86_64/packages/blfs-bootscripts/Makefile 2007-07-29 17:28:05 UTC
(rev 1992)
+++ branches/x86_64/packages/blfs-bootscripts/Makefile 2007-07-29 17:29:09 UTC
(rev 1993)
@@ -29,7 +29,6 @@
make install-service-pppoe
make install-gpm
make install-autosshd
- make install-dbus
install -m754 blfs/init.d/sshd /etc/rc.d/init.d/
install -m754 blfs/init.d/random /etc/rc.d/init.d/
install -m754 blfs/init.d/portmap /etc/rc.d/init.d/
Modified: branches/x86_64/packages/jhalfs/Makefile
===================================================================
--- branches/x86_64/packages/jhalfs/Makefile 2007-07-29 17:28:05 UTC (rev
1992)
+++ branches/x86_64/packages/jhalfs/Makefile 2007-07-29 17:29:09 UTC (rev
1993)
@@ -1,12 +1,12 @@
# jhalfs Makefile
NM= jhalfs
-VRS= 2.2
+VRS= 2.3
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.bz2
URL-$(FILE)=
http://www.linuxfromscratch.org/alfs/downloads/jhalfs/stable/$(FILE)
-SHA-$(FILE)= cd62df2c35c3502f26a85f7f96fcae4a8f7afddb
+SHA-$(FILE)= 1d4d9530692cced7bccf10122d28ff814d5195a6
FILE1= configuration
# Targets
Modified: branches/x86_64/packages/jhalfs/configuration
===================================================================
--- branches/x86_64/packages/jhalfs/configuration 2007-07-29 17:28:05 UTC
(rev 1992)
+++ branches/x86_64/packages/jhalfs/configuration 2007-07-29 17:29:09 UTC
(rev 1993)
@@ -25,6 +25,9 @@
# ARCH_SPARC is not set
# ARCH_ALPHA is not set
# ARCH_ARM is not set
+# ARCH_HPPA is not set
+# PLATFORM_GENERIC is not set
+# PLATFORM_WRT is not set
# DATA_32 is not set
# DATA_64 is not set
# DATA_MULTI is not set
@@ -33,11 +36,33 @@
# PROC_i686 is not set
# PROC_mipsel is not set
# PROC_mips is not set
+# PROC_unknown is not set
+# PROC_hppa1 is not set
+# PROC_hppa2 is not set
+# PROC_EV5 is not set
+# PROC_EV56 is not set
+# PROC_PCA56 is not set
+# PROC_PCA57 is not set
+# PROC_EV6 is not set
+# PROC_EV67 is not set
+# PROC_EV68 is not set
+# PROC_ARM is not set
+# PROC_ARM5L is not set
+# PROC_ARM5B is not set
+# PROC_ULTRA1 is not set
+# PROC_ULTRA2 is not set
+# PROC_ULTRA3 is not set
+# ABI_32 is not set
+# ABI_N32 is not set
+# ABI_64 is not set
TARGET=""
TARGET32=""
+PLATFORM="GENERIC"
+SPARC64_PROC="none"
ARCH=""
MIPS_LEVEL=""
ABI=""
+ENDIAN=""
# BUILD_CHROOT is not set
# BUILD_BOOT is not set
METHOD=""
@@ -46,6 +71,16 @@
# LIB_GLIBC is not set
# LIB_UCLIBC is not set
MODEL=""
+# KERNEL_26 is not set
+# KERNEL_24 is not set
+KERNEL=""
+SSP=",ssp,"
+ASLR=",aslr,"
+PAX=",pax,"
+HARDENED_TMP=",hardened_tmp,"
+WARNINGS=",warnings,"
+MISC=",misc,"
+BLOWFISH=",blowfish,"
# CUSTOM_TOOLS is not set
# BLFS_TOOL is not set
# BLFS_SVN is not set
@@ -56,12 +91,11 @@
# 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_GPM is not set
# DEP_SVN is not set
-# DEP_GPM is not set
BLFS_ROOT=""
BLFS_XML=""
TRACKING_DIR=""
@@ -74,8 +108,11 @@
SET_USER=""
# CONFIG_GROUP is not set
SET_GROUP=""
+# CONFIG_HOME is not set
+SET_HOME=""
LUSER="lfs"
LGROUP="lfs"
+LHOME="/home"
BUILDDIR="/mnt/build_dir"
GETPKG=y
# SRC_ARCHIVE is not set
@@ -95,6 +132,7 @@
NO_BOMB=y
# BOMB is not set
# BOMB_TEST is not set
+# INSTALL_LOG is not set
# HAVE_FSTAB is not set
FSTAB=""
# CONFIG_BUILD_KERNEL is not set
@@ -103,7 +141,6 @@
VIMLANG=y
TIMEZONE="GMT"
LANG="$LANG"
-LC_ALL=""
PAGE_LETTER=y
# PAGE_A4 is not set
PAGE="letter"
@@ -126,8 +163,12 @@
#
SCRIPT_ROOT="jhalfs"
JHALFSDIR="$BUILDDIR/$SCRIPT_ROOT"
+LOGDIRBASE="logs"
LOGDIR="$JHALFSDIR/logs"
+TESTLOGDIRBASE="test-logs"
TESTLOGDIR="$JHALFSDIR/test-logs"
+FILELOGDIRBASE="installed-files"
+FILELOGDIR="$JHALFSDIR/$FILELOGDIRBASE"
ICALOGDIR="$LOGDIR/ICA"
FARCELOGDIR="$LOGDIR/farce"
MKFILE="$JHALFSDIR/Makefile"
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
