wok-current rev 25672

patch tazpkg, upgrade core pkgs first
author Stanislas Leduc <shann@slitaz.org>
date Sun Mar 03 17:58:42 2024 +0000 (2 months ago)
parents eb01e2aee2ff
children 91035b7cc264
files tazpkg/receipt tazpkg/stuff/upgrade-core-pkg.patch
line diff
     1.1 --- a/tazpkg/receipt	Sun Mar 03 12:04:29 2024 +0000
     1.2 +++ b/tazpkg/receipt	Sun Mar 03 17:58:42 2024 +0000
     1.3 @@ -43,6 +43,10 @@
     1.4  	# Thanks Rantanplan, fix miss translate in tazpkg.fr.html
     1.5  	patch -p1 < $stuff/tazpkg-doc-fr.patch
     1.6  
     1.7 +	# Patch for upgrade core system package first
     1.8 +	patch -p1 < $stuff/upgrade-core-pkg.patch
     1.9 +	rm modules/upgrade.orig
    1.10 +	
    1.11  	sed -i 's|\. receipt|. ./receipt|' */*
    1.12  	make && make DESTDIR=$DESTDIR VERSION=$VERSION install
    1.13  }
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/tazpkg/stuff/upgrade-core-pkg.patch	Sun Mar 03 17:58:42 2024 +0000
     2.3 @@ -0,0 +1,17 @@
     2.4 +--- a/modules/upgrade
     2.5 ++++ b/modules/upgrade
     2.6 +@@ -84,6 +84,14 @@
     2.7 + '{printf "%-24s %-11s %-10s %s\n", $1, $4, $2, $5}';;
     2.8 + esac
     2.9 + sed -i /^$/d "$UP_LIST"
    2.10 ++# Ensure core system package upgrade first
    2.11 ++# glibc / gcc-lib-base
    2.12 ++if [[ "$(grep -F 'gcc-lib-base' $UP_LIST)" != '' ]]; then
    2.13 ++	sed -i -e '/gcc-lib-base/d' -e '1i gcc-lib-base' $UP_LIST
    2.14 ++fi
    2.15 ++if [[ "$(grep -F 'glibc-base' $UP_LIST)" != '' ]]; then
    2.16 ++	sed -i -e '/glibc-base/d' -e '1i glibc-base' $UP_LIST
    2.17 ++fi
    2.18 + upnb=$(wc -l < "$UP_LIST")
    2.19 + pkgs=$(wc -l < "$PKGS_DB/installed.info")
    2.20 + time=$(($(date +%s) - $time))