diff options
| author | Andreas Grapentin <andreas@grapentin.org> | 2018-04-01 22:31:03 +0200 |
|---|---|---|
| committer | Andreas Grapentin <andreas@grapentin.org> | 2018-04-01 22:31:03 +0200 |
| commit | f7b02f713c4b56504d7b2656b5ccddb4f960a82c (patch) | |
| tree | f82852fb8070b2d91546b7d755656c0ff6a1efe3 | |
| parent | 9ef7b5dadfa0fc1bacb93f211ecab4fe18a12581 (diff) | |
fixing more stage3 patches; adding logic to auto-fix bad patch paths
| -rw-r--r-- | src/shared/feedback.sh | 3 | ||||
| -rw-r--r-- | src/shared/package.sh | 7 | ||||
| -rw-r--r-- | src/stage3/patches/boost.patch (renamed from src/stage3/patches/boost-libs.patch) | 0 | ||||
| -rw-r--r-- | src/stage3/patches/lapack.patch (renamed from src/stage3/patches/blas.patch) | 0 | ||||
| -rw-r--r-- | src/stage3/patches/libaio.patch | 2 | ||||
| -rw-r--r-- | src/stage3/patches/systemd.patch | 6 |
6 files changed, 13 insertions, 5 deletions
diff --git a/src/shared/feedback.sh b/src/shared/feedback.sh index 39e0a0c..340cd49 100644 --- a/src/shared/feedback.sh +++ b/src/shared/feedback.sh @@ -28,8 +28,7 @@ export ERROR_KEYFAIL=5 # messaging functions notify() { # useful if running notify_telegram - local recipient=260151125 - #local recipient=-211578786 + local recipient=-211578786 if type -p notify-send >/dev/null; then machinectl -q shell --uid="$SUDO_USER" .host \ "$(which notify-send)" -h string:recipient:$recipient "$@" >/dev/null diff --git a/src/shared/package.sh b/src/shared/package.sh index 79a7f62..604793c 100644 --- a/src/shared/package.sh +++ b/src/shared/package.sh @@ -120,6 +120,13 @@ package_patch() { local patch="$SRCDIR/patches/$pkgbase$p".patch + # FIXME: this is temporary to fix bad patch names + local badpatch="$SRCDIR/patches/$pkgname".patch + if [ "x$pkgname" != "x$pkgbase" ] && [ -f "$badpatch" ]; then + error -n "$pkgname: $pkgname.patch should be $pkgbase.patch. renaming..." + mv "$badpatch" "$patch" + fi + if [ "x$r" == "xyes" ] && [ ! -e "$patch" ]; then error -n "$pkgname: missing $pkgbase$p.patch" return "$ERROR_MISSING" diff --git a/src/stage3/patches/boost-libs.patch b/src/stage3/patches/boost.patch index da60b61..da60b61 100644 --- a/src/stage3/patches/boost-libs.patch +++ b/src/stage3/patches/boost.patch diff --git a/src/stage3/patches/blas.patch b/src/stage3/patches/lapack.patch index c3e1280..c3e1280 100644 --- a/src/stage3/patches/blas.patch +++ b/src/stage3/patches/lapack.patch diff --git a/src/stage3/patches/libaio.patch b/src/stage3/patches/libaio.patch index 722f040..aa71639 100644 --- a/src/stage3/patches/libaio.patch +++ b/src/stage3/patches/libaio.patch @@ -8,7 +8,7 @@ +pkgver=0.3.111 pkgrel=1 pkgdesc="The Linux-native asynchronous I/O facility (aio) library" - arch=('x86_64') + arch=('i686' 'x86_64') url="http://lse.sourceforge.net/io/aio.html" license=('LGPL') -source=(http://ftp.de.debian.org/debian/pool/main/liba/$pkgname/${pkgname}_${pkgver}.orig.tar.gz) diff --git a/src/stage3/patches/systemd.patch b/src/stage3/patches/systemd.patch index 962dab8..fff02ad 100644 --- a/src/stage3/patches/systemd.patch +++ b/src/stage3/patches/systemd.patch @@ -1,15 +1,17 @@ --- a/PKGBUILD 2018-03-16 18:23:58.112034593 +0100 +++ b/PKGBUILD 2018-03-16 18:59:17.686017180 +0100 -@@ -85,6 +85,8 @@ sha512sums=('SKIP' +@@ -85,6 +85,10 @@ sha512sums=('SKIP' _backports=( # core: do not free heap-allocated strings (#8391) (FS#57741) '5cbaad2f6795088db56063d20695c6444595822f' + # basic/macros: rename noreturn into _noreturn_ (#8456) + '848e863acc51ecfb0f3955c498874588201d9130' ++ # libmount: include sys/mount.h only if necessary (#8507) ++ '061d1a51097c3c025ff46173f10aa135f9a610d4' ) _reverts=( -@@ -261,7 +262,7 @@ package_systemd() { +@@ -261,7 +265,7 @@ package_systemd() { rm -rv "$pkgdir"/etc/systemd/system/* # we'll create this on installation |