diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2019-07-23 09:42:02 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-07-23 09:42:02 +0000 |
| commit | 7c04249eb47ace702e9ae995b75ef777132d45a9 (patch) | |
| tree | 716d43b29e155f50c0dd62d7ab64bbef368da20c /main | |
| parent | 3a03ca3e078a953bf2795f2384faffedfd878891 (diff) | |
| download | aports-7c04249eb47ace702e9ae995b75ef777132d45a9.tar.bz2 aports-7c04249eb47ace702e9ae995b75ef777132d45a9.tar.xz | |
main/mkinitfs: fix build with musl-1.1.23
Diffstat (limited to 'main')
| -rw-r--r-- | main/mkinitfs/0001-nlplug-findfs.c-Explicitly-include-sys-sysmacros.h-d.patch | 25 | ||||
| -rw-r--r-- | main/mkinitfs/APKBUILD | 6 |
2 files changed, 29 insertions, 2 deletions
diff --git a/main/mkinitfs/0001-nlplug-findfs.c-Explicitly-include-sys-sysmacros.h-d.patch b/main/mkinitfs/0001-nlplug-findfs.c-Explicitly-include-sys-sysmacros.h-d.patch new file mode 100644 index 0000000000..2ea1694851 --- /dev/null +++ b/main/mkinitfs/0001-nlplug-findfs.c-Explicitly-include-sys-sysmacros.h-d.patch @@ -0,0 +1,25 @@ +From 098f197040e0942e8afc2d0ba498860a96be4137 Mon Sep 17 00:00:00 2001 +From: Andre F de Miranda <trixpan@users.noreply.github.com> +Date: Sun, 21 Jul 2019 12:10:51 +0000 +Subject: [PATCH] nlplug-findfs.c: Explicitly include sys/sysmacros.h due to + musl 1.1.23 changes + +--- + nlplug-findfs.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/nlplug-findfs.c b/nlplug-findfs.c +index 9f15de5..1ede4ca 100644 +--- a/nlplug-findfs.c ++++ b/nlplug-findfs.c +@@ -29,6 +29,7 @@ + #include <sys/mount.h> + #include <sys/socket.h> + #include <sys/stat.h> ++#include <sys/sysmacros.h> + #include <sys/types.h> + #include <sys/uio.h> + #include <sys/wait.h> +-- +2.22.0 + diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD index 4837adf6e3..e8021245b6 100644 --- a/main/mkinitfs/APKBUILD +++ b/main/mkinitfs/APKBUILD @@ -2,7 +2,7 @@ pkgname=mkinitfs pkgver=3.4.3 _ver=${pkgver%_git*} -pkgrel=0 +pkgrel=1 pkgdesc="Tool to generate initramfs images for Alpine" url="https://git.alpinelinux.org/cgit/mkinitfs" arch="all" @@ -16,6 +16,7 @@ subpackages="$pkgname-doc" install="$pkgname.pre-upgrade $pkgname.post-install $pkgname.post-upgrade" triggers="$pkgname.trigger=/usr/share/kernel/*" source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$_ver.tar.xz + 0001-nlplug-findfs.c-Explicitly-include-sys-sysmacros.h-d.patch " build() { @@ -28,4 +29,5 @@ package() { make install DESTDIR="$pkgdir" } -sha512sums="d335a6f58ca38a3cc6dcc560baaabd3ea9522ce25de008eb637f0761db7f783c3b03767ba046c3d34550d1d0741bcc54ad09903b41e79fe408264eadbbc0a457 mkinitfs-3.4.3.tar.xz" +sha512sums="d335a6f58ca38a3cc6dcc560baaabd3ea9522ce25de008eb637f0761db7f783c3b03767ba046c3d34550d1d0741bcc54ad09903b41e79fe408264eadbbc0a457 mkinitfs-3.4.3.tar.xz +6b7c16035181ab96a1d0dad9f31df8d74e6d39db775ce540b2b2efaaa4d918a18f331829f4113bff7a38805f648b7d83b7ec15adaaf78b17c9465dc0a19e8b32 0001-nlplug-findfs.c-Explicitly-include-sys-sysmacros.h-d.patch" |