diff options
Diffstat (limited to 'main')
-rw-r--r-- | main/drbd9-hardened/0001-build-fix-building-on-alpine.patch | 22 | ||||
-rw-r--r-- | main/drbd9-hardened/APKBUILD | 10 |
2 files changed, 4 insertions, 28 deletions
diff --git a/main/drbd9-hardened/0001-build-fix-building-on-alpine.patch b/main/drbd9-hardened/0001-build-fix-building-on-alpine.patch deleted file mode 100644 index 93ddd13c0b..0000000000 --- a/main/drbd9-hardened/0001-build-fix-building-on-alpine.patch +++ /dev/null @@ -1,22 +0,0 @@ -From b7d0c3abe2df11174cf275f06bb3e0210047cfc3 Mon Sep 17 00:00:00 2001 -From: Roland Kammerer <roland.kammerer@linbit.com> -Date: Tue, 16 Jan 2018 14:28:47 +0100 -Subject: [PATCH 1/1] build: fix building on alpine - ---- - drbd/Kbuild | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drbd/Kbuild b/drbd/Kbuild -index e63cefc1..e7263600 100644 ---- a/drbd/Kbuild -+++ b/drbd/Kbuild -@@ -150,4 +150,4 @@ $(obj)/drbd_buildtag.c: $(filter-out drbd_buildtag.o,$(drbd-y)) - buildinfo="reproducible build, `date -u -d@${SOURCE_DATE_EPOCH} "+%F %T"`" ; \ - fi ; \ - echo -e "\t\t\" $$buildinfo\";\n}"; \ -- mv --force $@.new $@ -+ mv -f $@.new $@ --- -2.15.1 - diff --git a/main/drbd9-hardened/APKBUILD b/main/drbd9-hardened/APKBUILD index b8b5404934..ddd09ac55e 100644 --- a/main/drbd9-hardened/APKBUILD +++ b/main/drbd9-hardened/APKBUILD @@ -8,13 +8,13 @@ _kpkg=linux-$_flavor _kver=4.9.73 _kpkgrel=0 -_usver=9.0.11 +_usver=9.0.12 # upstream now also has a -rel in the tar-balls # set it here for "source", but don't mangle it into pkgrel/_mypkgrel # if there is a new upstream rel (eg. 9.0.1-2), we just increase _mypkgrel _usrel=1 -_mypkgrel=1 +_mypkgrel=2 _kernelver=$_kver-r$_kpkgrel _abi_release=${_kver}-${_kpkgrel}-${_flavor} @@ -32,8 +32,7 @@ makedepends="linux-${_flavor}-dev bash" install="" subpackages="" provides="${_usname}9-grsec=${pkgver}-r${pkgrel}" -source="https://links.linbit.com/sources/$_usname/${_usver%.*}/$_usname-$_usver-$_usrel.tar.gz - 0001-build-fix-building-on-alpine.patch" +source="https://links.linbit.com/sources/$_usname/${_usver%.*}/$_usname-$_usver-$_usrel.tar.gz" _builddir=$srcdir/$_usname-$_usver-$_usrel prepare() { @@ -70,5 +69,4 @@ package() { make DESTDIR="$pkgdir" install || return 1 } -sha512sums="fdfc63e190b89c02683d5c3fe9fd60dfb81ea28e7635642d38453ba1e397324fdc15f8d2850955d6b77784d3aa6460e3fefb828f00c85be9d00865e7b05a0d36 drbd-9.0.11-1.tar.gz -5928bd53fa76493de85c1db420f68702a4638337c21feb317ddde94182d8218c758b3a736efa0f0357c9970ccf8575efb496830ac542b31c093580c5ae8a47f4 0001-build-fix-building-on-alpine.patch" +sha512sums="61fe8680583617116cf2200d6d6a56450e019c0c8946f8134820286f06b06cb444640e3fd7a395faa8668478fb28270f9a53c95184bdbbcd7b61304829bb1f57 drbd-9.0.12-1.tar.gz" |