zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

TRACKFILE should not contain LFS packages that are also in BLFS, ticket #1723

Browse source
This commit is contained in:
Pierre Labastie 2019-09-25 07:50:45 +00:00
parent 0974c32271
commit a1795f0351
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
BLFS/update-lfs.sh
View file

@ -98,11 +98,12 @@ if [ x$ANSWER = "xyes" ] ; then
for pack in $(grep '<productname' $LFS_FULL | for pack in $(grep '<productname' $LFS_FULL |
sed 's/.*>\([^<]*\)<.*/\1/' | sed 's/.*>\([^<]*\)<.*/\1/' |
sort | uniq); do sort | uniq); do
if [ "$pack" = "libstdc++" -o \ case "x$pack" in
"$pack" = "tcl" -o \ xtcl | xexpect | xdejagnu | xgcc* | *pass[12] | xvim |
"$pack" = "tcl-core" -o \ xshadow | xPython | xlinux-headers | xdbus | xsystemd )
"$pack" = "expect" -o \ continue ;;
"$pack" = "dejagnu" ]; then continue; fi esac
VERSION=$(grep -A1 ">$pack</product" $LFS_FULL | VERSION=$(grep -A1 ">$pack</product" $LFS_FULL |
head -n2 | head -n2 |
sed -n '2s/.*>\([^<]*\)<.*/\1/p') sed -n '2s/.*>\([^<]*\)<.*/\1/p')

9
common/libs/func_install_blfs
View file

@ -205,10 +205,11 @@ update:
@for pack in \$\$(grep '<productname' ../$LFS_XML/tmp/lfs-full.xml | \\ @for pack in \$\$(grep '<productname' ../$LFS_XML/tmp/lfs-full.xml | \\
sed 's/.*>\([^<]*\)<.*/\1/' | \\ sed 's/.*>\([^<]*\)<.*/\1/' | \\
sort | uniq); do \\ sort | uniq); do \\
if [ "x\$\$pack" = xtcl -o \\ case "x\$\$pack" in \\
"x\$\$pack" = xexpect -o \\ xtcl | xexpect | xdejagnu | xgcc* | *pass[12] | xvim | \\
"x\$\$pack" = xdejagnu ]; then continue; \\ xshadow | xPython | xlinux-headers | xdbus | xsystemd )\\
fi; \\ continue ;; \\
esac; \\
VERSION=\$\$(grep -A1 ">\$\$pack</product" \\ VERSION=\$\$(grep -A1 ">\$\$pack</product" \\
../$LFS_XML/tmp/lfs-full.xml | \\ ../$LFS_XML/tmp/lfs-full.xml | \\
head -n2| \\ head -n2| \\