Author: pierre
Date: Wed Sep 25 00:50:45 2019
New Revision: 4126
Log:
TRACKFILE should not contain LFS packages that are also in BLFS, ticket #1723
Modified:
jhalfs/trunk/BLFS/update-lfs.sh
jhalfs/trunk/common/libs/func_install_blfs
Modified: jhalfs/trunk/BLFS/update-lfs.sh
==============================================================================
--- jhalfs/trunk/BLFS/update-lfs.sh Sun Sep 15 20:50:29 2019 (r4125)
+++ jhalfs/trunk/BLFS/update-lfs.sh Wed Sep 25 00:50:45 2019 (r4126)
@@ -98,11 +98,12 @@
for pack in $(grep '<productname' $LFS_FULL |
sed 's/.*>\([^<]*\)<.*/\1/' |
sort | uniq); do
- if [ "$pack" = "libstdc++" -o \
- "$pack" = "tcl" -o \
- "$pack" = "tcl-core" -o \
- "$pack" = "expect" -o \
- "$pack" = "dejagnu" ]; then continue; fi
+ case "x$pack" in
+ xtcl | xexpect | xdejagnu | xgcc* | *pass[12] | xvim |
+ xshadow | xPython | xlinux-headers | xdbus | xsystemd )
+ continue ;;
+ esac
+
VERSION=$(grep -A1 ">$pack</product" $LFS_FULL |
head -n2 |
sed -n '2s/.*>\([^<]*\)<.*/\1/p')
Modified: jhalfs/trunk/common/libs/func_install_blfs
==============================================================================
--- jhalfs/trunk/common/libs/func_install_blfs Sun Sep 15 20:50:29 2019
(r4125)
+++ jhalfs/trunk/common/libs/func_install_blfs Wed Sep 25 00:50:45 2019
(r4126)
@@ -205,10 +205,11 @@
@for pack in \$\$(grep '<productname' ../$LFS_XML/tmp/lfs-full.xml | \\
sed 's/.*>\([^<]*\)<.*/\1/' | \\
sort | uniq); do \\
- if [ "x\$\$pack" = xtcl -o \\
- "x\$\$pack" = xexpect -o \\
- "x\$\$pack" = xdejagnu ]; then continue; \\
- fi; \\
+ case "x\$\$pack" in \\
+ xtcl | xexpect | xdejagnu | xgcc* | *pass[12] | xvim | \\
+ xshadow | xPython | xlinux-headers | xdbus | xsystemd )\\
+ continue ;; \\
+ esac; \\
VERSION=\$\$(grep -A1 ">\$\$pack</product" \\
../$LFS_XML/tmp/lfs-full.xml | \\
head -n2| \\
--
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page
