Author: pierre
Date: Sat Mar 11 08:53:29 2017
New Revision: 3909
Log:
Merge trunk revs 3906-8
Modified:
jhalfs/branches/new_features/CLFS/master.sh
jhalfs/branches/new_features/LFS/master.sh
jhalfs/branches/new_features/README.PACKAGE_MANAGEMENT
jhalfs/branches/new_features/pkgmngt/packageManager.xml.dpkg
jhalfs/branches/new_features/pkgmngt/packageManager.xml.pacman
Modified: jhalfs/branches/new_features/CLFS/master.sh
==============================================================================
--- jhalfs/branches/new_features/CLFS/master.sh Sat Mar 11 08:47:43 2017
(r3908)
+++ jhalfs/branches/new_features/CLFS/master.sh Sat Mar 11 08:53:29 2017
(r3909)
@@ -378,7 +378,7 @@
*grub | *aboot | *colo | *silo | *arcload | *lilo | *introduction )
continue ;;
*how-to-view*) continue ;;
*whatnext*) continue ;;
- *fstab) [[ ! -z ${FSTAB} ]] &&
+ *fstab) [[ -z "${FSTAB}" ]] ||
[[ ${FSTAB} == $BUILDDIR/sources/fstab ]] ||
cp ${FSTAB} $BUILDDIR/sources/fstab ;;
*kernel) # if there is no kernel config file do not build the kernel
@@ -499,7 +499,7 @@
*changingowner) wrt_RunAsRoot "${file}" ;;
*devices) wrt_RunAsRoot "${file}" ;;
*fstab)
- if [[ -n "$FSTAB" ]]; then
+ if [[ -n "${FSTAB}" ]]; then
LUSER_wrt_CopyFstab
else
LUSER_wrt_RunAsUser "${file}"
@@ -734,10 +734,10 @@
this_script=`basename $file`
case $this_script in
- *udev) continue ;; # This is not a script but a commentary, we want
udev-rules
+ *udev) continue ;; # This is not a script but a comment, we want
udev-rules
*console*) continue ;; # Use the files that came with the bootscripts
# fstab is now here (for 3.x.y)
- *fstab) [[ ! -z ${FSTAB} ]] &&
+ *fstab) [[ -z "${FSTAB}" ]] ||
[[ ${FSTAB} == $BUILDDIR/sources/fstab ]] ||
cp ${FSTAB} $BUILDDIR/sources/fstab ;;
*) ;;
@@ -912,7 +912,7 @@
# A little housekeeping on the scripts
case $this_script in
*grub | *aboot | *colo | *silo | *arcload | *lilo | *reboot* ) continue
;;
- *fstab) [[ ! -z ${FSTAB} ]] &&
+ *fstab) [[ -z "${FSTAB}" ]] ||
[[ ${FSTAB} == $BUILDDIR/sources/fstab ]] ||
cp ${FSTAB} $BUILDDIR/sources/fstab ;;
*kernel) # if there is no kernel config file do not build the kernel
Modified: jhalfs/branches/new_features/LFS/master.sh
==============================================================================
--- jhalfs/branches/new_features/LFS/master.sh Sat Mar 11 08:47:43 2017
(r3908)
+++ jhalfs/branches/new_features/LFS/master.sh Sat Mar 11 08:53:29 2017
(r3909)
@@ -312,7 +312,7 @@
# If no .config file is supplied, the kernel build is skipped
case ${this_script} in
*grub) continue ;;
- *fstab) [[ ! -z ${FSTAB} ]] &&
+ *fstab) [[ -z "${FSTAB}" ]] ||
[[ ${FSTAB} == $BUILDDIR/sources/fstab ]] ||
cp ${FSTAB} $BUILDDIR/sources/fstab ;;
*kernel) [[ -z ${CONFIG} ]] && continue
@@ -366,7 +366,7 @@
# Check if we have a real /etc/fstab file
case "${this_script}" in
- *fstab) if [[ -n $FSTAB ]]; then
+ *fstab) if [[ -n "$FSTAB" ]]; then
CHROOT_wrt_CopyFstab
else
CHROOT_wrt_RunAsRoot "$file"
Modified: jhalfs/branches/new_features/README.PACKAGE_MANAGEMENT
==============================================================================
--- jhalfs/branches/new_features/README.PACKAGE_MANAGEMENT Sat Mar 11
08:47:43 2017 (r3908)
+++ jhalfs/branches/new_features/README.PACKAGE_MANAGEMENT Sat Mar 11
08:53:29 2017 (r3909)
@@ -5,14 +5,14 @@
There are several hints discussing package management for LFS, but
nothing under jhalfs. There used to be a patch for PACO that I cannot
- find now. This is a modification, which allows to use a package manager
- inside jhalfs. I hope it is flexible enough to support several package
- managers. My implementation uses dpkg, from Debian, in a very crude way.
- Debian has a sophisticated package management system, which I have not
- tried to use here. For example, it should be usable with Pacman from
- Arch Linux (http://www.archlinux.org), as far as I remember from my old
- days with DIYL. I am sorry to say I have (almost) no experience with
- rpm, so I cannot tell whether it would fit.
+ find now. This is a modification ("DESTDIR install" automation), which
+ allows to use a package manager inside jhalfs. I hope it is flexible enough
+ to support several package managers, at least among those who use DESTDIR
+ install. My initial implementation used dpkg, from Debian, in a very
+ crude way (Debian has a sophisticated package management system, which
+ I have not tried to use here). There is also a port to Pacman from
+ Arch Linux (http://www.archlinux.org). I am sorry to say I have (almost)
+ no experience with rpm, so I cannot tell whether it would fit.
2. OVERVIEW OF THE SYSTEM:
@@ -56,4 +56,6 @@
upgrade. The user has to write his own `packInstall' function. The shell
function should be defined in a file named `packInstall.sh', residing in
the `pkgmngt' directory. A template is provided, as well as two example
- scripts for dpkg and pacman.
+ scripts for dpkg and pacman. Note that, due to the way pacman checks the
+ available space on disk, the root directory in chroot must be a mount point,
+ otherwise the installation of packages fails.
Modified: jhalfs/branches/new_features/pkgmngt/packageManager.xml.dpkg
==============================================================================
--- jhalfs/branches/new_features/pkgmngt/packageManager.xml.dpkg Sat Mar
11 08:47:43 2017 (r3908)
+++ jhalfs/branches/new_features/pkgmngt/packageManager.xml.dpkg Sat Mar
11 08:53:29 2017 (r3909)
@@ -9,10 +9,10 @@
<!ENTITY before "Must be installed before">
<!ENTITY external "Optional dependencies">
<!ENTITY debian-pool "http://ftp2.fr.debian.org/debian/pool/main/";>
-<!ENTITY dpkg-version "1.18.3">
-<!ENTITY dpkg-size "4,258 KB">
+<!ENTITY dpkg-version "1.18.23">
+<!ENTITY dpkg-size "4,411 KB">
<!ENTITY dpkg-url "&debian-pool;d/dpkg/dpkg_&dpkg-version;.tar.xz">
-<!ENTITY dpkg-md5 "a5ca138121cc37c8fb0083462a3b4d47">
+<!ENTITY dpkg-md5 "2195338c1792b0678575309a099d2da8">
<!ENTITY dpkg-home "http://wiki.debian.org/Teams/Dpkg";>
<!ENTITY dpkg-ch5-du "56 MB">
<!ENTITY dpkg-ch5-sbu "0.2 SBU">
@@ -111,7 +111,7 @@
--disable-nls --disable-dselect \
--disable-start-stop-daemon \
--disable-update-alternatives \
- --without-zlib --with-liblzma=static --without-selinux</userinput></screen>
+ --without-zlib --with-liblzma=static
--without-libselinux</userinput></screen>
<variablelist>
<title>The meaning of the configure options:</title>
@@ -157,10 +157,10 @@
</varlistentry>
<varlistentry>
- <term><parameter>--without-selinux</parameter></term>
+ <term><parameter>--without-libselinux</parameter></term>
<listitem>
<para>Disable building for <application>selinux</application>, which
- is not used woth LFS/BLFS.</para>
+ is not used with LFS/BLFS.</para>
</listitem>
</varlistentry>
@@ -275,7 +275,7 @@
--disable-dselect \
--disable-start-stop-daemon \
--disable-update-alternatives \
- --without-selinux</userinput></screen>
+ --without-libselinux</userinput></screen>
<variablelist>
<title>The meaning of the configure options:</title>
@@ -304,7 +304,7 @@
</varlistentry>
<varlistentry>
- <term><parameter>--without-selinux</parameter></term>
+ <term><parameter>--without-libselinux</parameter></term>
<listitem>
<para>Selinux is not used in LFS.</para>
</listitem>
Modified: jhalfs/branches/new_features/pkgmngt/packageManager.xml.pacman
==============================================================================
--- jhalfs/branches/new_features/pkgmngt/packageManager.xml.pacman Sat Mar
11 08:47:43 2017 (r3908)
+++ jhalfs/branches/new_features/pkgmngt/packageManager.xml.pacman Sat Mar
11 08:53:29 2017 (r3909)
@@ -22,7 +22,7 @@
<para>MD5 sum:
<literal>e9aa6dec29920eba8ef706ea5823bad7</literal></para>
<para>Download: <ulink
url="http://www.libarchive.org/downloads/libarchive-3.1.2.tar.gz"/></para>
<para>MD5 sum:
<literal>efad5a503f66329bb9d2f4308b5de98a</literal></para>
- <para>Download: <ulink
url="ftp://ftp.archlinux.org/other/pacman/pacman-4.1.2.tar.gz"/></para>
+ <para>Download: <ulink
url="https://sources.archlinux.org/other/pacman/pacman-4.1.2.tar.gz"/></para>
<para>MD5 sum:
<literal>063c8b0ff6bdf903dc235445525627cd</literal></para>
</sect1>
@@ -43,6 +43,7 @@
<sect2 role="installation">
<screen><userinput remap="configure">./configure --prefix=/tools \
--without-bz2lib \
+ --without-xml2 \
--enable-bsdtar=static \
--enable-bsdcpio=static</userinput></screen>
<screen><userinput remap="make">make</userinput></screen>
@@ -75,6 +76,7 @@
remap attribute are considered configuration instructions and executed last.
You
can also use remap="adjust" for the same purpose. -->
<screen><userinput remap="configure">./configure --prefix=/tools \
+ --without-openssl \
PKG_CONFIG_PATH=/tools/lib/pkgconfig \
DUPATH=/tools/bin/du</userinput></screen>
--
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page
