diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2018-06-15 04:12:46 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2018-06-15 21:00:34 +0200 |
commit | b5ea33bed63971ceb6b819ef86df097b9ee26b0d (patch) | |
tree | 13a8fb928037ccc9be2e1d347535dea4e18f7af9 /source/ap/slackpkg/slackpkg.SlackBuild | |
parent | 086112c734c9b6018855be83798bcdaf61505c14 (diff) | |
download | current-b5ea33bed63971ceb6b819ef86df097b9ee26b0d.tar.gz |
Fri Jun 15 04:12:46 UTC 201820180615041246
a/efibootmgr-16-x86_64-2.txz: Rebuilt.
a/efivar-35-x86_64-1.txz: Upgraded.
Switch to efivar-35, since 36 seems to have problems. Thanks to _RDS_.
ap/slackpkg-2.83.0-noarch-3.txz: Rebuilt.
Don't remove ChangeLog.txt upon upgrade/reinstall.
Use CHECKSUMS.md5.asc to determine if ChangeLog.txt is unchanged.
Remove dead bjtu.edu.cn mirrors from the sample mirrors files.
isolinux/initrd.img: Rebuilt.
Include libefivar.so.1 on the installer (needed by efibootmgr).
usb-and-pxe-installers/usbboot.img: Rebuilt.
Include libefivar.so.1 on the installer (needed by efibootmgr).
Diffstat (limited to 'source/ap/slackpkg/slackpkg.SlackBuild')
-rwxr-xr-x | source/ap/slackpkg/slackpkg.SlackBuild | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/source/ap/slackpkg/slackpkg.SlackBuild b/source/ap/slackpkg/slackpkg.SlackBuild index 7dc1949d..2d6fe94c 100755 --- a/source/ap/slackpkg/slackpkg.SlackBuild +++ b/source/ap/slackpkg/slackpkg.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=slackpkg VERSION=${VERSION:-2.83.0} ARCH="noarch" -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # If the variable PRINT_PACKAGE_NAME is set, then this script will report what # the name of the created package would be, and then exit. This information @@ -76,11 +76,6 @@ gzip -d $PKG/usr/libexec/slackpkg/functions.d/* chmod 755 $PKG/usr/libexec/slackpkg/functions.d/* chown root:root $PKG/usr/libexec/slackpkg/functions.d/* -# Apply patch in case /var/log/packages is a symlink: -( cd $PKG/usr/libexec/slackpkg - zcat $CWD/0001-Fix-for-var_log_packages-being-a-symlink.patch.gz | patch -p1 || exit 1 -) || exit 1 - # Install man pages: mkdir -pv $PKG/usr/man/man5 cp -av slackpkg.conf.5.gz $PKG/usr/man/man5 @@ -124,6 +119,21 @@ gzip -d $PKG/usr/doc/slackpkg-$VERSION/* mkdir -pv $PKG/var/lib/slackpkg mkdir -pv $PKG/var/cache/packages +# Apply patch in case /var/log/packages is a symlink: +( cd $PKG/usr/libexec/slackpkg + zcat $CWD/0001-Fix-for-var_log_packages-being-a-symlink.patch.gz | patch -p1 --verbose || exit 1 +) || exit 1 + +# Check for new Changelog.txt by checking CHECKSUMS.md5.asc first: +( cd $PKG/usr/libexec/slackpkg + zcat $CWD/0002-Use-CHECKSUMS.md5.asc-to-determine-ChangeLog-newness.patch.gz | patch -p2 --verbose || exit 1 +) || exit 1 + +# Remove dead mirrors: +( cd $PKG/usr/doc/slackpkg-$VERSION + zcat $CWD/0003-mirrors-x86-.sample-Remove-bjtu.edu.cn-mirror.patch.gz | patch -p2 --verbose || exit 1 +) || exit 1 + mkdir -p $PKG/install zcat $CWD/doinst.sh.gz | sed -e "s/@VERSION@/$VERSION/g" > $PKG/install/doinst.sh cat $CWD/slack-desc > $PKG/install/slack-desc |