diff options
author | KARBOWSKI Piotr <piotr.karbowski@gmail.com> | 2020-04-12 21:35:47 +0200 |
---|---|---|
committer | KARBOWSKI Piotr <piotr.karbowski@gmail.com> | 2020-04-12 21:35:47 +0200 |
commit | 798036fc3893a32437dce8c6e26c18b5ff7df65f (patch) | |
tree | 29be863a7a3eb2612886c7fdf44d5d24739fa0e7 | |
parent | cryptsetup 2.0.0 -> 2.3.1 bump (diff) | |
download | better-initramfs-798036fc3893a32437dce8c6e26c18b5ff7df65f.tar.xz better-initramfs-798036fc3893a32437dce8c6e26c18b5ff7df65f.zip |
mdadm 4.0 -> 4.1 version bump
Also, import of Alpine upstream patches.
-rw-r--r-- | ChangeLog | 2 | ||||
-rwxr-xr-x | bootstrap/lebuilds/mdadm.lebuild | 2 | ||||
-rw-r--r-- | bootstrap/patches/mdadm/mdadm-include-sysmacros.patch | 10 | ||||
-rw-r--r-- | bootstrap/patches/mdadm/no-werror.patch | 13 |
4 files changed, 25 insertions, 2 deletions
@@ -33,7 +33,7 @@ devel branch: libgcrypt 1.6.4 -> 1.8.5 json-c 0.13.1 (new dependency) cryptsetup 1.7.0 -> 2.3.1 - mdadm 3.3.6 -> 4.0 + mdadm 3.3.6 -> 4.1 libaio 0.3.112 (new dependency) libblkid 2.35.1 (new dependency) suspend removed diff --git a/bootstrap/lebuilds/mdadm.lebuild b/bootstrap/lebuilds/mdadm.lebuild index 6880dd5..53f3ef7 100755 --- a/bootstrap/lebuilds/mdadm.lebuild +++ b/bootstrap/lebuilds/mdadm.lebuild @@ -1,6 +1,6 @@ #!/bin/sh name='mdadm' -version='4.0' +version='4.1' sources=( "https://bitbucket.org/piotrkarbowski/better-initramfs/downloads/${name}-${version}.tar.xz" ) homepage='http://neil.brown.name/blog/mdadm' license='GPLv2' diff --git a/bootstrap/patches/mdadm/mdadm-include-sysmacros.patch b/bootstrap/patches/mdadm/mdadm-include-sysmacros.patch new file mode 100644 index 0000000..09d755e --- /dev/null +++ b/bootstrap/patches/mdadm/mdadm-include-sysmacros.patch @@ -0,0 +1,10 @@ +--- a/mdadm.h ++++ b/mdadm.h +@@ -34,6 +34,7 @@ + #endif + + #include <sys/types.h> ++#include <sys/sysmacros.h> + #include <sys/stat.h> + #include <stdint.h> + #include <stdlib.h> diff --git a/bootstrap/patches/mdadm/no-werror.patch b/bootstrap/patches/mdadm/no-werror.patch new file mode 100644 index 0000000..f4164c5 --- /dev/null +++ b/bootstrap/patches/mdadm/no-werror.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +index 5fd7f16..5095a42 100644 +--- a/Makefile ++++ b/Makefile +@@ -43,7 +43,7 @@ KLIBC_GCC = gcc -nostdinc -iwithprefix include -I$(KLIBC)/klibc/include -I$(KLIB + + CC ?= $(CROSS_COMPILE)gcc + CXFLAGS ?= -ggdb +-CWFLAGS = -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter ++CWFLAGS = -Wall -Wstrict-prototypes -Wextra -Wno-unused-parameter + ifdef WARN_UNUSED + CWFLAGS += -Wp,-D_FORTIFY_SOURCE=2 -O3 + endif |