From 98eafc30c56258ffe89476ab54ad50060bbcfc03 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Wed, 23 May 2018 13:56:58 +0200 Subject: [PATCH 1/7] mdadm: Increment build number --- mdadm.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mdadm.be0 b/mdadm.be0 index 4f441a2ba..ae4a092f0 100755 --- a/mdadm.be0 +++ b/mdadm.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION mdadm-4.0-0 +# BEE_VERSION mdadm-4.0-1 ## The source URL(s) array SRCURL[0]="https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-${PKGVERSION}.tar.xz" From c71cb9ef0eb4a96f2b81b7d810bb6496ef8feafe Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Wed, 23 May 2018 14:15:22 +0200 Subject: [PATCH 2/7] mdadm: Exclude some compiler warnings from being fatal gcc 7.3.0 has some more warnings, which are triggered by the source. Do not make these fatal. --- mdadm.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mdadm.be0 b/mdadm.be0 index ae4a092f0..817d70e85 100755 --- a/mdadm.be0 +++ b/mdadm.be0 @@ -32,7 +32,7 @@ SRCURL[0]="https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-${PKGVERSION} #} mee_build() { - bee_build -j1 everything + bee_build CXFLAGS="-Wno-error=implicit-fallthrough -Wno-error=format-overflow -Wno-error=format-truncation" -j 1 everything } ## mee_install() should install into "${D}" From 219aafc0b05191f563c4a4f707c8bc8b5ff61bac Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Wed, 23 May 2018 14:34:12 +0200 Subject: [PATCH 3/7] mdadm: Change build target The target 'everything' does not include mdadm which is required by make install, just some variants like mdadm.static or mdadm.O2. We don't want compilation done in the install phase. The default target includes 'mdadm' but not all things we want to install. Explicitly enumerate the build targets we want. --- mdadm.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mdadm.be0 b/mdadm.be0 index 817d70e85..ea78c302d 100755 --- a/mdadm.be0 +++ b/mdadm.be0 @@ -32,7 +32,7 @@ SRCURL[0]="https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-${PKGVERSION} #} mee_build() { - bee_build CXFLAGS="-Wno-error=implicit-fallthrough -Wno-error=format-overflow -Wno-error=format-truncation" -j 1 everything + bee_build CXFLAGS="-Wno-error=implicit-fallthrough -Wno-error=format-overflow -Wno-error=format-truncation" -j 1 mdadm mdmon test_stripe raid6check } ## mee_install() should install into "${D}" From 1ab3fc462934ee2286cd94ebfdadfadd70dd2c46 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Wed, 23 May 2018 14:42:57 +0200 Subject: [PATCH 4/7] mdadm: Remove "-j 1" Testing showed, that a parallel build works. Remove option. --- mdadm.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mdadm.be0 b/mdadm.be0 index ea78c302d..08abac983 100755 --- a/mdadm.be0 +++ b/mdadm.be0 @@ -32,7 +32,7 @@ SRCURL[0]="https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-${PKGVERSION} #} mee_build() { - bee_build CXFLAGS="-Wno-error=implicit-fallthrough -Wno-error=format-overflow -Wno-error=format-truncation" -j 1 mdadm mdmon test_stripe raid6check + bee_build CXFLAGS="-Wno-error=implicit-fallthrough -Wno-error=format-overflow -Wno-error=format-truncation" mdadm mdmon test_stripe raid6check } ## mee_install() should install into "${D}" From 33f38b3b4f327f7ef6e1c80e501bd03a28e416d7 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Wed, 23 May 2018 14:46:39 +0200 Subject: [PATCH 5/7] mdadm: Add mdcheck tool Install the mdcheck script provided by this package. It can be used to scrub the md raids. --- mdadm.be0 | 1 + 1 file changed, 1 insertion(+) diff --git a/mdadm.be0 b/mdadm.be0 index 08abac983..6dc2bd935 100755 --- a/mdadm.be0 +++ b/mdadm.be0 @@ -46,4 +46,5 @@ mee_install_post() { start_cmd install -D -m 755 ${S}/test_stripe ${D}${BINDIR} start_cmd install -D -m 755 ${S}/raid6check ${D}${BINDIR} start_cmd install -D -m 644 ${S}/raid6check.8 ${D}${MANDIR}/man8 + start_cmd install -D -m 755 ${S}/misc/mdcheck ${D}${BINDIR} } From ff217e7e9db74741e05925e38b559d7afc793ad7 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Wed, 23 May 2018 14:53:41 +0200 Subject: [PATCH 6/7] mdadm: Do not install udev rules We don't want raid assembly done by udev, because we use some mariux specific tool for it. By not installing these udev rules, we no longer need to mask them which is currently done by the mdadm-fixup package. Remove udev rule files from image. --- mdadm.be0 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mdadm.be0 b/mdadm.be0 index 6dc2bd935..85d63896b 100755 --- a/mdadm.be0 +++ b/mdadm.be0 @@ -47,4 +47,7 @@ mee_install_post() { start_cmd install -D -m 755 ${S}/raid6check ${D}${BINDIR} start_cmd install -D -m 644 ${S}/raid6check.8 ${D}${MANDIR}/man8 start_cmd install -D -m 755 ${S}/misc/mdcheck ${D}${BINDIR} + rm ${D}/lib/udev/rules.d/63-md-raid-arrays.rules + rm ${D}/lib/udev/rules.d/64-md-raid-assembly.rules + rmdir ${D}/lib/udev/rules.d ${D}/lib/udev ${D}/lib } From ef66bfbbcb4bdbdd5dece2b2ea7fb2e970f9b44b Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Wed, 23 May 2018 15:02:50 +0200 Subject: [PATCH 7/7] mdadm-fixup: Remove This package is no longer required, because the package mdadm has been modified to not install the rule files. Remove this package. --- mdadm-fixup.be0 | 47 ----------------------------------------------- 1 file changed, 47 deletions(-) delete mode 100755 mdadm-fixup.be0 diff --git a/mdadm-fixup.be0 b/mdadm-fixup.be0 deleted file mode 100755 index 55fb7a39b..000000000 --- a/mdadm-fixup.be0 +++ /dev/null @@ -1,47 +0,0 @@ -#!/usr/bin/env beesh - -# BEE_VERSION mdadm-fixup-4.0-0 - -## The source URL(s) array -# SRCURL[0]= - -## Add URLs/pathes to patch files -# PATCHURL+=() - -## files that should not be added from the image directory. -# EXCLUDE+=() - -## uncomment to change default -# build_in_sourcedir - -## specify different source directory -# sourcesubdir_append src - -#mee_extract() { -# bee_extract "${@}" -#} - -#mee_patch() { -# bee_patch "${@}" -#} - -#mee_configure() { -# bee_configure -#} - -#mee_build() { -# bee_build -j1 everything -#} - -## mee_install() should install into "${D}" -## default: 'make install DESTDIR="${D}"' - -#mee_install() { -# bee_install -#} - -mee_install_post() { - start_cmd mkdir -vp ${D}/etc/udev/rules.d - start_cmd ln -vs /dev/null ${D}/etc/udev/rules.d/63-md-raid-arrays.rules - start_cmd ln -vs /dev/null ${D}/etc/udev/rules.d/64-md-raid-assembly.rules -}