[PATCH 1/2] mdadm: fix do_package failed when changed local.conf but not cleaned

[PATCH 1/2] mdadm: fix do_package failed when changed local.conf but not cleaned

[changqing.li]

From: Changqing Li <changqing.li@windriver.com>

reproduce steps:
1. add DISTRO_FEATURE_append = 'usrmerge' in local.conf
2. bitbake mdadm --success
3. remove DISTRO_FEATURE_append = 'usrmerge' from local.conf
4. bitbake mdadm  -- failed when do_package

it is not proper to change source Makefile during do_install by sed,
change to add patch for it.

[YOCTO #13493]

Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
 .../mdadm/files/0001-mdadm-support-usrmerge.patch  | 46 ++++++++++++++++++++++
 meta/recipes-extended/mdadm/mdadm_4.1.bb           |  7 ++--
 2 files changed, 50 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-extended/mdadm/files/0001-mdadm-support-usrmerge.patch

diff --git a/meta/recipes-extended/mdadm/files/0001-mdadm-support-usrmerge.patch b/meta/recipes-extended/mdadm/files/0001-mdadm-support-usrmerge.patch
new file mode 100644
index 0000000..f1aa119
--- /dev/null
+++ b/meta/recipes-extended/mdadm/files/0001-mdadm-support-usrmerge.patch
@@ -0,0 +1,46 @@
+From 2c7ccea05d7cf9dde48d735faa511d1b06c14878 Mon Sep 17 00:00:00 2001
+From: Changqing Li <changqing.li@windriver.com>
+Date: Thu, 5 Sep 2019 18:03:11 +0800
+Subject: [PATCH] mdadm: support usrmerge
+
+Upstream-Status: Inappropriate[oe-specific]
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ Makefile | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 4839001..466e960 100644
+--- a/Makefile
++++ b/Makefile
+@@ -88,7 +88,7 @@ MAP_PATH = $(MAP_DIR)/$(MAP_FILE)
+ MDMON_DIR = $(RUN_DIR)
+ # place for autoreplace cookies
+ FAILED_SLOTS_DIR = $(RUN_DIR)/failed-slots
+-SYSTEMD_DIR=/lib/systemd/system
++SYSTEMD_DIR=${SYSTEMD_UNITDIR}/system
+ LIB_DIR=/usr/libexec/mdadm
+ 
+ COROSYNC:=$(shell [ -f $(SYSROOT)/usr/include/corosync/cmap.h ] || echo -DNO_COROSYNC)
+@@ -120,7 +120,7 @@ LDLIBS=-ldl
+ 
+ INSTALL = /usr/bin/install
+ DESTDIR =
+-BINDIR  = /sbin
++BINDIR  = ${BASE_SBINDIR}
+ MANDIR  = /usr/share/man
+ MAN4DIR = $(MANDIR)/man4
+ MAN5DIR = $(MANDIR)/man5
+@@ -128,7 +128,7 @@ MAN8DIR = $(MANDIR)/man8
+ 
+ UDEVDIR := $(shell $(PKG_CONFIG) --variable=udevdir udev 2>/dev/null)
+ ifndef UDEVDIR
+- UDEVDIR = /lib/udev
++ UDEVDIR = ${NONARCH_BASE_LIBDIR}/udev
+ endif
+ 
+ ifeq (,$(findstring s,$(MAKEFLAGS)))
+-- 
+2.7.4
+
diff --git a/meta/recipes-extended/mdadm/mdadm_4.1.bb b/meta/recipes-extended/mdadm/mdadm_4.1.bb
index 74c94f6..86c73ab 100644
--- a/meta/recipes-extended/mdadm/mdadm_4.1.bb
+++ b/meta/recipes-extended/mdadm/mdadm_4.1.bb
@@ -22,6 +22,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \
 	   file://mdadm.init \
 	   file://0001-mdadm-add-option-y-for-use-syslog-to-recive-event-re.patch \
            file://include_sysmacros.patch \
+           file://0001-mdadm-support-usrmerge.patch \
            "
 SRC_URI[md5sum] = "51bf3651bd73a06c413a2f964f299598"
 SRC_URI[sha256sum] = "ab7688842908d3583a704d491956f31324c3a5fc9f6a04653cb75d19f1934f4a"
@@ -41,13 +42,13 @@ CFLAGS_append_powerpc64 = ' -D__SANE_USERSPACE_TYPES__'
 CFLAGS_append_mipsarchn64 = ' -D__SANE_USERSPACE_TYPES__'
 CFLAGS_append_mipsarchn32 = ' -D__SANE_USERSPACE_TYPES__'
 
-EXTRA_OEMAKE = 'CHECK_RUN_DIR=0 CXFLAGS="${CFLAGS}"'
+EXTRA_OEMAKE = 'CHECK_RUN_DIR=0 CXFLAGS="${CFLAGS}" BASE_SBINDIR="${base_sbindir}" \
+                NONARCH_BASE_LIBDIR="${nonarch_base_libdir}" \
+                SYSTEMD_UNITDIR="${systemd_unitdir}"'
 
 DEBUG_OPTIMIZATION_append = " -Wno-error"
 
 do_compile() {
-	# Point to right sbindir
-	sed -i -e "s;BINDIR  = /sbin;BINDIR = $base_sbindir;" -e "s;UDEVDIR = /lib;UDEVDIR = $nonarch_base_libdir;" -e "s;SYSTEMD_DIR=/lib/systemd/system;SYSTEMD_DIR=${systemd_unitdir}/system;" ${S}/Makefile
 	oe_runmake SYSROOT="${STAGING_DIR_TARGET}"
 }
 
-- 
2.7.4

[PATCH 2/2] mdadm: skip timeout testcase 11spare-migration

[changqing.li]

From: Changqing Li <changqing.li@windriver.com>

[YOCTO #13368]

Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
 .../0001-mdadm-skip-test-11spare-migration.patch   | 43 ++++++++++++++++++++++
 meta/recipes-extended/mdadm/mdadm_4.1.bb           |  2 +
 2 files changed, 45 insertions(+)
 create mode 100644 meta/recipes-extended/mdadm/files/0001-mdadm-skip-test-11spare-migration.patch

diff --git a/meta/recipes-extended/mdadm/files/0001-mdadm-skip-test-11spare-migration.patch b/meta/recipes-extended/mdadm/files/0001-mdadm-skip-test-11spare-migration.patch
new file mode 100644
index 0000000..3a192cc
--- /dev/null
+++ b/meta/recipes-extended/mdadm/files/0001-mdadm-skip-test-11spare-migration.patch
@@ -0,0 +1,43 @@
+From 1b83afa7c3121f819e72ea74883f8b6d61d6548e Mon Sep 17 00:00:00 2001
+From: Changqing Li <changqing.li@windriver.com>
+Date: Fri, 6 Sep 2019 10:59:02 +0800
+Subject: [PATCH] mdadm: skip test 11spare-migration
+
+11spare-migration is a test series to check mdadm Monitor migrates spares
+according to rules in /etc/mdadm.conf defined by POLICY lines.
+
+[snip]
+for scan in no yes; do
+       for platform in 1.2 imsm; do
+               try
+       done
+done
+[snip]
+
+"try" includes near 20 sub testcase, so there are nearly 80 subcases need to run,
+so it will take long time than ptest-runner timeout limit, skip it as workaround.
+
+Upstream-Status: Inappropriate[oe-specific]
+
+Signed-off-by: Changqing Li <changqing.li@windriver.com>
+---
+ test | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/test b/test
+index 711a3c7..880dd1d 100755
+--- a/test
++++ b/test
+@@ -272,6 +272,9 @@ main() {
+ 	else
+ 		for script in $testdir/$prefix $testdir/$prefix*[^~]
+ 		do
++			if [ $script == "$testdir/11spare-migration" ];then
++				continue
++			fi
+ 			do_test $script
+ 		done
+ 	fi
+-- 
+2.7.4
+
diff --git a/meta/recipes-extended/mdadm/mdadm_4.1.bb b/meta/recipes-extended/mdadm/mdadm_4.1.bb
index 86c73ab..8b6e227 100644
--- a/meta/recipes-extended/mdadm/mdadm_4.1.bb
+++ b/meta/recipes-extended/mdadm/mdadm_4.1.bb
@@ -23,7 +23,9 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \
 	   file://0001-mdadm-add-option-y-for-use-syslog-to-recive-event-re.patch \
            file://include_sysmacros.patch \
            file://0001-mdadm-support-usrmerge.patch \
+           file://0001-mdadm-skip-test-11spare-migration.patch \
            "
+
 SRC_URI[md5sum] = "51bf3651bd73a06c413a2f964f299598"
 SRC_URI[sha256sum] = "ab7688842908d3583a704d491956f31324c3a5fc9f6a04653cb75d19f1934f4a"
 
-- 
2.7.4

Re: [PATCH 1/2] mdadm: fix do_package failed when changed local.conf but not cleaned

[Richard Purdie]

On Fri, 2019-09-06 at 11:37 +0800, changqing.li@windriver.com wrote:
> From: Changqing Li <changqing.li@windriver.com>
> 
> reproduce steps:
> 1. add DISTRO_FEATURE_append = 'usrmerge' in local.conf
> 2. bitbake mdadm --success
> 3. remove DISTRO_FEATURE_append = 'usrmerge' from local.conf
> 4. bitbake mdadm  -- failed when do_package
> 
> it is not proper to change source Makefile during do_install by sed,
> change to add patch for it.
> 
> [YOCTO #13493]
> 
> Signed-off-by: Changqing Li <changqing.li@windriver.com>

This somehow seems to break:

oe-selftest -r devtool.DevtoolModifyTests.test_devtool_buildclean
and
oe-selftest -r devtool.DevtoolModifyTests.test_devtool_modify

https://autobuilder.yoctoproject.org/typhoon/#/builders/56/builds/694

Cheers,

Richard

Re: [PATCH 1/2] mdadm: fix do_package failed when changed local.conf but not cleaned

[Changqing Li]

On 9/7/19 5:48 AM, Richard Purdie wrote:
> On Fri, 2019-09-06 at 11:37 +0800, changqing.li@windriver.com wrote:
>> From: Changqing Li <changqing.li@windriver.com>
>>
>> reproduce steps:
>> 1. add DISTRO_FEATURE_append = 'usrmerge' in local.conf
>> 2. bitbake mdadm --success
>> 3. remove DISTRO_FEATURE_append = 'usrmerge' from local.conf
>> 4. bitbake mdadm  -- failed when do_package
>>
>> it is not proper to change source Makefile during do_install by sed,
>> change to add patch for it.
>>
>> [YOCTO #13493]
>>
>> Signed-off-by: Changqing Li <changqing.li@windriver.com>
> This somehow seems to break:
>
> oe-selftest -r devtool.DevtoolModifyTests.test_devtool_buildclean
> and
> oe-selftest -r devtool.DevtoolModifyTests.test_devtool_modify
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/56/builds/694
>
> Cheers,
>
> Richard

I researched this problem,  it is not problem of this patch, but this 
patch reveal

the defect of the testcase.


without this patch, Makefile is changed during first run of do_compile 
task,

for external_src, EXTERNALSRC is one of inputs of sigdata of do_compile,

then will rerun the second time's compile task.  but this cover defects 
of testcase,

please see the fixed patch for details.


I have send 2 patch to fix the problem of testcase,  which is titled 
with devtool.py


BRs

Sandy

>
>
>