Author: pierre
Date: Mon Mar 20 07:12:25 2017
New Revision: 3931
Log:
Merge trunk r3926-27
Modified:
jhalfs/branches/new_features/BLFS/xsl/scripts.xsl
jhalfs/branches/new_features/common/libs/func_install_blfs
jhalfs/branches/new_features/common/libs/func_validate_configs.sh
jhalfs/branches/new_features/jhalfs
Modified: jhalfs/branches/new_features/BLFS/xsl/scripts.xsl
==============================================================================
--- jhalfs/branches/new_features/BLFS/xsl/scripts.xsl Sun Mar 19 14:30:09
2017 (r3930)
+++ jhalfs/branches/new_features/BLFS/xsl/scripts.xsl Mon Mar 20 07:12:25
2017 (r3931)
@@ -151,7 +151,8 @@
*)
UNPACKDIR=$PKG_DIR-build
mkdir $UNPACKDIR
- cp $PACKAGE $UNPACKDIR
+ cp $SRC_DIR/$PACKAGE $UNPACKDIR
+ cp $(find . -mindepth 1 -maxdepth 1 -type l) $UNPACKDIR
;;
esac
export UNPACKDIR
Modified: jhalfs/branches/new_features/common/libs/func_install_blfs
==============================================================================
--- jhalfs/branches/new_features/common/libs/func_install_blfs Sun Mar 19
14:30:09 2017 (r3930)
+++ jhalfs/branches/new_features/common/libs/func_install_blfs Mon Mar 20
07:12:25 2017 (r3931)
@@ -193,12 +193,6 @@
-i $BUILDDIR$BLFS_ROOT/scripts/*lynx
fi
fi
-# The book instructions for CA certificates suppose that the cerdata.txt
-# file is in the same directory as make-ca.sh-<version>. This is not the
-# case with our default instructions. Just remove the "cd $UNPACKDIR" here.
-if test -f $BUILDDIR$BLFS_ROOT/scripts/*cacerts; then
- sed -i '/cd \$UNPACKDIR/d' $BUILDDIR$BLFS_ROOT/scripts/*cacerts
-fi
# At last generates the build Makefile
mkdir -p $BUILDDIR$BLFS_ROOT/work
pushd $BUILDDIR$BLFS_ROOT/work
Modified: jhalfs/branches/new_features/common/libs/func_validate_configs.sh
==============================================================================
--- jhalfs/branches/new_features/common/libs/func_validate_configs.sh Sun Mar
19 14:30:09 2017 (r3930)
+++ jhalfs/branches/new_features/common/libs/func_validate_configs.sh Mon Mar
20 07:12:25 2017 (r3931)
@@ -83,6 +83,15 @@
exit 1
}
+# This function is only used when testing package management files.
+ write_pkg_and_die() {
+ echo -e "\n${DD_BORDER}"
+ echo "Package management is requested but" >&2
+ echo -e $* >&2
+ echo -e "${DD_BORDER}\n"
+ exit 1
+ }
+
validate_file() {
# For parameters ending with a '+' failure causes a warning message only
echo -n "`eval echo $PARAM_VALS`"
@@ -192,6 +201,28 @@
[[ "${!config_param}" = "**EDIT ME**" ]] &&
write_error_and_die
;;
+ # Case of PKGMNGT: two files, packageManager.xml and packInstall.sh
+ # must exist in $PKGMNGTDIR:
+ PKGMNGT) echo -e "`eval echo $PARAM_VALS`"
+ if [ ! -e "$PKGMNGTDIR/packageManager.xml" ]; then
+ write_pkg_and_die $PKGMNGTDIR/packageManager.xml does not
exist
+ fi
+ if [ ! -e "$PKGMNGTDIR/packInstall.sh" ]; then
+ write_pkg_and_die $PKGMNGTDIR/packInstall.sh does not exist
+ fi
+ if [ ! -s "$PKGMNGTDIR/packageManager.xml" ]; then
+ write_pkg_and_die $PKGMNGTDIR/packageManager.xml has zero size
+ fi
+ if [ ! -s "$PKGMNGTDIR/packInstall.sh" ]; then
+ write_pkg_and_die $PKGMNGTDIR/packInstall.sh has zero size
+ fi
+ if [ ! -r "$PKGMNGTDIR/packageManager.xml" ]; then
+ write_pkg_and_die $PKGMNGTDIR/packageManager.xml is not
readable
+ fi
+ if [ ! -r "$PKGMNGTDIR/packInstall.sh" ]; then
+ write_pkg_and_die $PKGMNGTDIR/packInstall.sh is not readable
+ fi
+ ;;
# Display non-validated envars found in ${PROGNAME}_PARAM_LIST
* ) echo -e "`eval echo $PARAM_VALS`" ;;
Modified: jhalfs/branches/new_features/jhalfs
==============================================================================
--- jhalfs/branches/new_features/jhalfs Sun Mar 19 14:30:09 2017 (r3930)
+++ jhalfs/branches/new_features/jhalfs Mon Mar 20 07:12:25 2017 (r3931)
@@ -384,9 +384,10 @@
#
# Copy packageManager.xml, if needed
- [[ "$PKGMNGT" = "y" ]] && [[ "$PROGNAME" = "lfs" ]] &&
- cp $PKGMNGTDIR/packageManager.xml $JHALFSDIR/ &&
+ [[ "$PKGMNGT" = "y" ]] && [[ "$PROGNAME" = "lfs" ]] && {
+ cp $PKGMNGTDIR/packageManager.xml $JHALFSDIR/
cp $PKGMNGTDIR/packInstall.sh $JHALFSDIR/
+ }
#
# Copy urls.xsl, if needed
[[ "$GETPKG" = "y" ]] && cp $COMMON_DIR/urls.xsl $JHALFSDIR/
--
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page
