Date   

Re: need Sysvinit as system manager in Rocko Version #rocko

rohit jadhav
 

Hi Khem Raj,
Thanks you for your valuable feedback.
I have tried with your suggestions.
but observed with following error:
ERROR: /home/tel/imx_yocto_bsp/sources/meta-fsl-bsp-release/imx/meta-sdk/recipes-fsl/packagegroup/packagegroup-qt5-webengine.bb: Please ensure that your setting of VIRTUAL-RUNTIME_init_manager (systemd) matches the entries enabled in DISTRO_FEATURES
ERROR: /home/tel/imx_yocto_bsp/sources/meta-fsl-bsp-release/imx/meta-sdk/recipes-fsl/packagegroup/packagegroup-qt5-demos.bb: Please ensure that your setting of VIRTUAL-RUNTIME_init_manager (systemd) matches the entries enabled in DISTRO_FEATURES
ERROR: /home/tel/imx_yocto_bsp/sources/meta-fsl-bsp-release/imx/meta-sdk/recipes-fsl/packagegroup/packagegroup-imx-erpc.bb: Please ensure that your setting of VIRTUAL-RUNTIME_init_manager (systemd) matches the entries enabled in DISTRO_FEATURES
ERROR: /home/tel/imx_yocto_bsp/sources/meta-fsl-bsp-release/imx/meta-sdk/recipes-fsl/packagegroup/packagegroup-fsl-tools-gpu-external.bb: Please ensure that your setting of VIRTUAL-RUNTIME_init_manager (systemd) matches the entries enabled in DISTRO_FEATURES
ERROR: Failed to parse recipe: /home/tel/imx_yocto_bsp/sources/meta-fsl-bsp-release/imx/meta-sdk/recipes-fsl/packagegroup/packagegroup-imx-erpc.bb
ERROR: /home/tel/imx_yocto_bsp/sources/meta-fsl-bsp-release/imx/meta-sdk/recipes-fsl/packagegroup/packagegroup-fsl-optee-imx.bb: Please ensure that your setting of VIRTUAL-RUNTIME_init_manager (systemd) matches the entries enabled in DISTRO_FEATURES
ERROR: /home/tel/imx_yocto_bsp/sources/meta-fsl-bsp-release/imx/meta-sdk/recipes-fsl/packagegroup/packagegroup-fsl-pulseaudio.bb: Please ensure that your setting of VIRTUAL-RUNTIME_init_manager (systemd) matches the entries enabled in DISTRO_FEATURES
ERROR: /home/tel/imx_yocto_bsp/sources/meta-fsl-bsp-release/imx/meta-sdk/recipes-fsl/packagegroup/packagegroup-fsl-tools-audio.bb: Please ensure that your setting of VIRTUAL-RUNTIME_init_manager (systemd) matches the entries enabled in DISTRO_FEATURES

Thanks and regards
Rohit J


On Tue, Apr 13, 2021 at 8:58 PM Khem Raj <raj.khem@...> wrote:


On 4/13/21 3:02 AM, rohitbjadhav1@... wrote:
> I have created rootfs with Rocko yocto version.
>
> I need sysyvinit as system manager instead of Systemd.
>
> I have tried with following in local.conf
>
> DISTRO_FEATURES_append = " sysvinit"

remove systemd from DISTRO_FEATURES as well.

DISTRO_FEATURES_remove = "sytemd"

>
> VIRTUAL-RUNTIME_init_manager = "sysvinit"
>
> VIRTUAL-RUNTIME_initscripts = "initscripts"
>
> It created run-level folder like rcS and rc0.d to rc6.d. but did not
> created inittab file in /etc .
>
> And after booting it rootfs boots up with systemd only
> root@imx6ull14x14evk:~# ps -p1 | grep "init\|upstart\|systemd"
>      1 ?        00:00:07 systemd
> I need init as system manager . can you please guide me in this regard.
>
> Thank you
>
> Regards
> Rohit
>
>
>
>
>


[meta-rockchip][PATCH 5/6] WIP nanopi-m4: declare OP-TEE presence in devicetree

Yann Dirson
 

From: Yann Dirson <yann@...>

FIXME:

- this is not specific to the board, and would indeed apply to any SoC
supported by OP-TEE.
- should rather be selected by "optee" in DISTRO_FEATURES, maybe using
a dts overlay
---
.../0001-nanopi-declare-optee-presence.patch | 30 +++++++++++++++++++
recipes-kernel/linux/linux-yocto%.bbappend | 1 +
2 files changed, 31 insertions(+)
create mode 100644 recipes-kernel/linux/files/0001-nanopi-declare-optee-=
presence.patch

diff --git a/recipes-kernel/linux/files/0001-nanopi-declare-optee-presenc=
e.patch b/recipes-kernel/linux/files/0001-nanopi-declare-optee-presence.p=
atch
new file mode 100644
index 0000000..aede781
--- /dev/null
+++ b/recipes-kernel/linux/files/0001-nanopi-declare-optee-presence.patch
@@ -0,0 +1,30 @@
+From 30cb714e717990276a5fabc50dc616c83b223ee7 Mon Sep 17 00:00:00 2001
+From: Yann Dirson <yann@...>
+Date: Mon, 12 Apr 2021 15:50:26 +0200
+Subject: [PATCH] nanopi: declare optee presence
+
+---
+ arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4.dts | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4.dts b/arch/ar=
m64/boot/dts/rockchip/rk3399-nanopi-m4.dts
+index 60358ab8c7df..ef11639b03f6 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4.dts
++++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4.dts
+@@ -16,6 +16,13 @@ / {
+ model =3D "FriendlyElec NanoPi M4";
+ compatible =3D "friendlyarm,nanopi-m4", "rockchip,rk3399";
+=20
++ firmware {
++ optee {
++ compatible =3D "linaro,optee-tz";
++ method =3D "smc";
++ };
++ };
++
+ vdd_5v: vdd-5v {
+ compatible =3D "regulator-fixed";
+ regulator-name =3D "vdd_5v";
+--=20
+2.30.2
+
diff --git a/recipes-kernel/linux/linux-yocto%.bbappend b/recipes-kernel/=
linux/linux-yocto%.bbappend
index 9658681..97b3238 100644
--- a/recipes-kernel/linux/linux-yocto%.bbappend
+++ b/recipes-kernel/linux/linux-yocto%.bbappend
@@ -2,6 +2,7 @@ FILESEXTRAPATHS_prepend :=3D "${THISDIR}/files:"
=20
SRC_URI_append =3D "\
file://bsp;type=3Dkmeta;subdir=3Dkernel-meta \
+ file://0001-nanopi-declare-optee-presence.patch \
"
=20
COMPATIBLE_MACHINE_marsboard-rk3066 =3D "marsboard-rk3066"
--=20
2.30.2


[meta-rockchip][PATCH 6/6] WIP kernel config feature for OP-TEE activation

Yann Dirson
 

From: Yann Dirson <yann@...>

FIXME:
- provide an .scc with proper information
- maybe bundle with dts overlay
- select a more suitable path in config namespace
---
recipes-kernel/linux/files/bsp/tee.cfg | 2 ++
1 file changed, 2 insertions(+)
create mode 100644 recipes-kernel/linux/files/bsp/tee.cfg

diff --git a/recipes-kernel/linux/files/bsp/tee.cfg b/recipes-kernel/linu=
x/files/bsp/tee.cfg
new file mode 100644
index 0000000..82213a5
--- /dev/null
+++ b/recipes-kernel/linux/files/bsp/tee.cfg
@@ -0,0 +1,2 @@
+CONFIG_TEE=3Dm
+CONFIG_OPTEE=3Dm
--=20
2.30.2


[meta-rockchip][PATCH 4/6] WIP optee-os: rk3399 support

Yann Dirson
 

From: Yann Dirson <yann@...>

This is the current state of working patches being discussed in
https://github.com/OP-TEE/optee_os/issues/4542
---
conf/machine/include/rk3399.inc | 2 +
...399-enable-serial-console-by-default.patch | 46 +++++++++++++++++++
.../optee/files/rk3399-boot-fix.patch | 13 ++++++
recipes-security/optee/optee%.bbappend | 2 +
recipes-security/optee/optee-os_%.bbappend | 9 ++++
5 files changed, 72 insertions(+)
create mode 100644 recipes-security/optee/files/0001-rk3399-enable-seria=
l-console-by-default.patch
create mode 100644 recipes-security/optee/files/rk3399-boot-fix.patch
create mode 100644 recipes-security/optee/optee-os_%.bbappend

diff --git a/conf/machine/include/rk3399.inc b/conf/machine/include/rk339=
9.inc
index f6b7826..9ac434e 100644
--- a/conf/machine/include/rk3399.inc
+++ b/conf/machine/include/rk3399.inc
@@ -13,6 +13,8 @@ KBUILD_DEFCONFIG ?=3D "defconfig"
KERNEL_CLASSES =3D "kernel-fitimage"
KERNEL_IMAGETYPE =3D "fitImage"
=20
+OPTEEMACHINE =3D "rockchip-rk3399"
+
TFA_PLATFORM =3D "rk3399"
TFA_BUILD_TARGET =3D "bl31"
=20
diff --git a/recipes-security/optee/files/0001-rk3399-enable-serial-conso=
le-by-default.patch b/recipes-security/optee/files/0001-rk3399-enable-ser=
ial-console-by-default.patch
new file mode 100644
index 0000000..31daef7
--- /dev/null
+++ b/recipes-security/optee/files/0001-rk3399-enable-serial-console-by-d=
efault.patch
@@ -0,0 +1,46 @@
+From 0e2cbe08532a1344aab62f21b032ce6171e50f49 Mon Sep 17 00:00:00 2001
+From: Yann Dirson <yann@...>
+Date: Mon, 12 Apr 2021 10:49:18 +0200
+Subject: [PATCH] rk3399: enable serial console by default
+Upstream-Status: Submitted [https://github.com/OP-TEE/optee_os/pull/4551=
]
+
+Signed-off-by: Yann Dirson <yann@...>
+---
+ core/arch/arm/plat-rockchip/conf.mk | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+Index: git/core/arch/arm/plat-rockchip/conf.mk
+=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
+--- git.orig/core/arch/arm/plat-rockchip/conf.mk
++++ git/core/arch/arm/plat-rockchip/conf.mk
+@@ -26,8 +26,6 @@ CFG_EARLY_CONSOLE_BAUDRATE ?=3D 1500000
+ CFG_EARLY_CONSOLE_CLK_IN_HZ ?=3D 24000000
+ endif
+=20
+-CFG_EARLY_CONSOLE ?=3D n
+-
+ ifeq ($(PLATFORM_FLAVOR),rk3399)
+ include core/arch/arm/cpu/cortex-armv8-0.mk
+ $(call force,CFG_TEE_CORE_NB_CORE,6)
+@@ -37,6 +35,12 @@ CFG_TZDRAM_START ?=3D 0x30000000
+ CFG_TZDRAM_SIZE ?=3D 0x02000000
+ CFG_SHMEM_START ?=3D 0x32000000
+ CFG_SHMEM_SIZE ?=3D 0x00400000
++
++CFG_EARLY_CONSOLE ?=3D y
++CFG_EARLY_CONSOLE_BASE ?=3D UART2_BASE
++CFG_EARLY_CONSOLE_SIZE ?=3D UART2_SIZE
++CFG_EARLY_CONSOLE_BAUDRATE ?=3D 1500000
++CFG_EARLY_CONSOLE_CLK_IN_HZ ?=3D 24000000
+ endif
+=20
+ ifeq ($(PLATFORM_FLAVOR),px30)
+@@ -47,6 +51,8 @@ CFG_TZDRAM_START ?=3D 0x30000000
+ CFG_TZDRAM_SIZE ?=3D 0x02000000
+ CFG_SHMEM_START ?=3D 0x32000000
+ CFG_SHMEM_SIZE ?=3D 0x00400000
++
++CFG_EARLY_CONSOLE ?=3D n
+ endif
+=20
+ ifeq ($(platform-flavor-armv8),1)
diff --git a/recipes-security/optee/files/rk3399-boot-fix.patch b/recipes=
-security/optee/files/rk3399-boot-fix.patch
new file mode 100644
index 0000000..d346157
--- /dev/null
+++ b/recipes-security/optee/files/rk3399-boot-fix.patch
@@ -0,0 +1,13 @@
+Index: git/core/arch/arm/kernel/entry_a64.S
+=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
+--- git.orig/core/arch/arm/kernel/entry_a64.S
++++ git/core/arch/arm/kernel/entry_a64.S
+@@ -219,7 +219,7 @@ clear_nex_bss:
+ adr_l x0, __text_start
+ ldr x1, cached_mem_end
+ sub x1, x1, x0
+- bl dcache_cleaninv_range
++/* bl dcache_cleaninv_range*/
+=20
+=20
+ /*
diff --git a/recipes-security/optee/optee%.bbappend b/recipes-security/op=
tee/optee%.bbappend
index 2a8722a..ec11863 100644
--- a/recipes-security/optee/optee%.bbappend
+++ b/recipes-security/optee/optee%.bbappend
@@ -1,2 +1,4 @@
+COMPATIBLE_MACHINE_rk3399 ?=3D "rk3399"
+
inherit features_check
REQUIRED_DISTRO_FEATURES =3D "optee"
diff --git a/recipes-security/optee/optee-os_%.bbappend b/recipes-securit=
y/optee/optee-os_%.bbappend
new file mode 100644
index 0000000..eceb694
--- /dev/null
+++ b/recipes-security/optee/optee-os_%.bbappend
@@ -0,0 +1,9 @@
+EXTRA_OEMAKE_append_rk3399 =3D " \
+ CFG_CORE_ASLR=3Dn \
+"
+
+FILESEXTRAPATHS_prepend :=3D "${THISDIR}/files:"
+SRC_URI +=3D "\
+ file://rk3399-boot-fix.patch \
+ file://0001-rk3399-enable-serial-console-by-default.patch \
+"
--=20
2.30.2


[meta-rockchip][PATCH 1/6] optee: condition for "optee" DISTRO_FEATURE

Yann Dirson
 

From: Yann Dirson <yann@...>

This effectively sets up a single switch to activate OP-TEE support.
Disabling optee-* recipes when the feature is not set is not the
primary goal, though it can occasionally be handy to catch
dependencies pulling them without using the new DISTRO_FEATURE, which
provides a safeguard to ensure downstream recipes in need of upgrade
will fail early.

The main value for this flag is for dependent recipes to know when to
activate the OP-TEE support, rather than having to control each of
them separately:

- u-boot
- trusted-firmware-a
- kernel

Signed-off-by: Yann Dirson <yann@...>
---
recipes-security/optee/optee%.bbappend | 2 ++
1 file changed, 2 insertions(+)
create mode 100644 recipes-security/optee/optee%.bbappend

diff --git a/recipes-security/optee/optee%.bbappend b/recipes-security/op=
tee/optee%.bbappend
new file mode 100644
index 0000000..2a8722a
--- /dev/null
+++ b/recipes-security/optee/optee%.bbappend
@@ -0,0 +1,2 @@
+inherit features_check
+REQUIRED_DISTRO_FEATURES =3D "optee"
--=20
2.30.2


[meta-rockchip][PATCH 0/6] WIP/RFC OP-TEE support for ARM and rk3399

Yann Dirson
 

From: Yann Dirson <yann@...>

This tries to provide a generic framework for easier OP-TEE support in
BSP layers. It would probably make sense to have the generic parts in
meta-arm when they are finalized. Today the kernel/dts handling is
still not properly done, and patches to fix rk3399 support in OP-TEE
have not yet been merged upstream, and I'm mostly posting this to
gather comments on the whole idea.

Yann Dirson (6):
optee: condition for "optee" DISTRO_FEATURE
truster-firmware-a: include optee support when requested by
DISTRO_FEATURE
u-boot: include optee-os as BL32 when requested by DISTRO_FEATURE
WIP optee-os: rk3399 support
WIP nanopi-m4: declare OP-TEE presence in devicetree
WIP kernel config feature for OP-TEE activation

conf/machine/include/rk3399.inc | 2 +
.../trusted-firmware-a_%.bbappend | 19 ++++++++
recipes-bsp/u-boot/u-boot%.bbappend | 14 ++++++
.../0001-nanopi-declare-optee-presence.patch | 30 ++++++++++++
recipes-kernel/linux/files/bsp/tee.cfg | 2 +
recipes-kernel/linux/linux-yocto%.bbappend | 1 +
...399-enable-serial-console-by-default.patch | 46 +++++++++++++++++++
.../optee/files/rk3399-boot-fix.patch | 13 ++++++
recipes-security/optee/optee%.bbappend | 4 ++
recipes-security/optee/optee-os_%.bbappend | 9 ++++
10 files changed, 140 insertions(+)
create mode 100644 recipes-kernel/linux/files/0001-nanopi-declare-optee-=
presence.patch
create mode 100644 recipes-kernel/linux/files/bsp/tee.cfg
create mode 100644 recipes-security/optee/files/0001-rk3399-enable-seria=
l-console-by-default.patch
create mode 100644 recipes-security/optee/files/rk3399-boot-fix.patch
create mode 100644 recipes-security/optee/optee%.bbappend
create mode 100644 recipes-security/optee/optee-os_%.bbappend

--=20
2.30.2


[meta-rockchip][PATCH 2/6] truster-firmware-a: include optee support when requested by DISTRO_FEATURE

Yann Dirson
 

From: Yann Dirson <yann@...>

This instructs TF-A to:

- load OP-TEE OS as BL32, but still relies on the actual image to be
provided through other means, eg. in u-boot.itb
- run opteed as Secure Payload Dispatcher

This is configured automatically when DISTRO_FEATURE includes "optee".

Signed-off-by: Yann Dirson <yann@...>
---
.../trusted-firmware-a_%.bbappend | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)

diff --git a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend=
b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
index 1942c17..5b04311 100644
--- a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
+++ b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
@@ -9,3 +9,22 @@ FILESEXTRAPATHS_prepend :=3D "${THISDIR}/files:"
SRC_URI +=3D "\
file://serial-console-baudrate.patch \
"
+
+# OP-TEE, dependent on "optee" DISTRO_FEATURES
+
+OPTEE_DEPENDS ?=3D "optee-os:do_deploy"
+OPTEE_OEMAKE ?=3D " \
+ BL32=3D${STAGING_DIR_TARGET}${nonarch_base_libdir}/firmware/tee-head=
er_v2.bin \
+ BL32_EXTRA1=3D${STAGING_DIR_TARGET}${nonarch_base_libdir}/firmware/t=
ee-pager_v2.bin \
+ BL32_EXTRA2=3D${STAGING_DIR_TARGET}${nonarch_base_libdir}/firmware/t=
ee-pageable_v2.bin \
+ "
+
+do_compile[depends] .=3D " \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'optee', ' ${OPTEE_DEPENDS}', '=
', d)} \
+"
+
+EXTRA_OEMAKE_append =3D " \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'optee', ' ${OPTEE_OEMAKE}', ''=
, d)} \
+"
+
+TFA_SPD ?=3D "${@bb.utils.contains('DISTRO_FEATURES', 'optee', 'opteed',=
'', d)}"
--=20
2.30.2


[meta-rockchip][PATCH 3/6] u-boot: include optee-os as BL32 when requested by DISTRO_FEATURE

Yann Dirson
 

From: Yann Dirson <yann@...>

This causes OP-TEE to get included into the u-boot.itb fitImage so u-boot
can load it for the trusted-firmware-a BL31 to run it.

This is configured automatically when DISTRO_FEATURE includes "optee".

Signed-off-by: Yann Dirson <yann@...>
---
recipes-bsp/u-boot/u-boot%.bbappend | 14 ++++++++++++++
1 file changed, 14 insertions(+)

diff --git a/recipes-bsp/u-boot/u-boot%.bbappend b/recipes-bsp/u-boot/u-b=
oot%.bbappend
index 95c019d..c8e150b 100644
--- a/recipes-bsp/u-boot/u-boot%.bbappend
+++ b/recipes-bsp/u-boot/u-boot%.bbappend
@@ -5,6 +5,8 @@ do_compile_append_rock2-square () {
fi
}
=20
+# TF-A, when supported
+
ATF_DEPENDS ??=3D ""
=20
EXTRA_OEMAKE_append_rk3399 =3D " BL31=3D${DEPLOY_DIR_IMAGE}/bl31-rk3399.=
elf"
@@ -14,3 +16,15 @@ ATF_DEPENDS_rk3328 =3D " virtual/trusted-firmware-a:do=
_deploy"
=20
do_compile[depends] .=3D "${ATF_DEPENDS}"
=20
+# OP-TEE, dependent on "optee" DISTRO_FEATURES
+
+OPTEE_DEPENDS ?=3D "optee-os:do_deploy"
+OPTEE_OEMAKE ?=3D " TEE=3D${DEPLOY_DIR_IMAGE}/optee/tee.elf"
+
+do_compile[depends] .=3D " \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'optee', ' ${OPTEE_DEPENDS}', '=
', d)} \
+"
+
+EXTRA_OEMAKE_append =3D " \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'optee', ' ${OPTEE_OEMAKE}', ''=
, d)} \
+"
--=20
2.30.2


Re: QA notification for completed autobuilder build (yocto-3.3.rc2)

Khem Raj
 

LGTM

On 4/13/21 2:48 AM, Sangeeta Jain wrote:
Hello All,
This is the full report for yocto-3.3.rc2:
https://git.yoctoproject.org/cgit/cgit.cgi/yocto-testresults-contrib/tree/?h=intel-yocto-testresults
======= Summary ========
No high milestone defects.
No new issue found.
Thanks,
Sangeeta

-----Original Message-----
From: yocto@... <yocto@...> On Behalf
Of Pokybuild User
Sent: Wednesday, 7 April, 2021 8:16 PM
To: yocto@...
Cc: qa-build-notification@...
Subject: [yocto] QA notification for completed autobuilder build (yocto-3.3.rc2)


A build flagged for QA (yocto-3.3.rc2) was completed on the autobuilder and is
available at:


https://autobuilder.yocto.io/pub/releases/yocto-3.3.rc2


Build hash information:

bitbake: a1848a481e36b729c8e4130c394b1d462d4b488a
meta-arm: 219fd34b7676ffedd1a1ad3626ec4337391975f4
meta-gplv2: 9e119f333cc8f53bd3cf64326f826dbc6ce3db0f
meta-intel: 01cfc99a8f960917433a8a46b41bb4febb5b1993
meta-kernel: 29329d7cacc71595cecfdd05a455a0cfb164564d
meta-mingw: 422b96cb2b6116442be1f40dfb5bd77447d1219e
oecore: 14241ed09f9ed317045cf75a6d08416d3579bb8d
poky: e1839b58ebe05242a52fe050aa9a08140136aa0a



This is an automated message from the Yocto Project Autobuilder
Git: git://git.yoctoproject.org/yocto-autobuilder2
Email: richard.purdie@...






Re: need Sysvinit as system manager in Rocko Version #rocko

Khem Raj
 

On 4/13/21 3:02 AM, rohitbjadhav1@... wrote:
I have created rootfs with Rocko yocto version.
I need sysyvinit as system manager instead of Systemd.
I have tried with following in local.conf
DISTRO_FEATURES_append = " sysvinit"
remove systemd from DISTRO_FEATURES as well.

DISTRO_FEATURES_remove = "sytemd"

VIRTUAL-RUNTIME_init_manager = "sysvinit"
VIRTUAL-RUNTIME_initscripts = "initscripts"
It created run-level folder like rcS and rc0.d to rc6.d. but did not created inittab file in /etc .
And after booting it rootfs boots up with systemd only
root@imx6ull14x14evk:~# ps -p1 | grep "init\|upstart\|systemd"
    1 ?        00:00:07 systemd
I need init as system manager . can you please guide me in this regard.
Thank you
Regards
Rohit


Yocto Project Status WW15`21

Stephen Jolley
 

Current Dev Position: YP 3.3 M4 (Feature Freeze)

Next Deadline: 5th April 2021 YP 3.3 M4 build

 

Next Team Meetings:

 

Key Status/Updates:

  • YP 3.3 rc2 has a clean bill of health from QA so pending TSC approval and release notes/migration guide, it's looking likely to release. rc1 was abandoned due to a couple of intermittent autobuilder issues accounted on the first build.
  • YP 3.1.7 is being built today
  • There are a number of pending patches queued in master-next waiting for 3.4 to open for development.
  • We do have some development series undergoing review now such as the PRServ rework and changes to the git fetcher to make it more efficient.
  • Intermittent autobuilder issues continue to occur and are now at a record high level. You  can see the list of failures we’re continuing to see by searching for the “AB-INT” tag in bugzilla: https://bugzilla.yoctoproject.org/buglist.cgi?quicksearch=AB-INT

We are working to identify the load pattern on the infrastructure that seems to trigger these.

 

Ways to contribute:

 

YP 3.3 Milestone Dates:

  • YP 3.3 M4 is out of QA.

 

YP 3.4 Milestone Dates:

  • YP 3.4 M1 build date 2021/06/07
  • YP 3.4 M1 Release date 2021/06/18
  • YP 3.4 M2 build date 2021/07/12
  • YP 3.4 M2 Release date 2021/07/23
  • YP 3.4 M3 build date 2021/08/23
  • YP 3.4 M3 Release date 2021/09/03
  • YP 3.4 M4 build date 2021/10/04
  • YP 3.4 M4 Release date 2021/10/29

 

Planned upcoming dot releases:

  • YP 3.1.7 is being built.
  • YP 3.1.7 release date 2021/04/09
  • YP 3.2.4 build date 2021/05/3
  • YP 3.2.4 release date 2021/05/14
  • YP 3.1.8 build date 2021/05/17
  • YP 3.1.8 release date 2021/05/28
  • YP 3.3.1 build date 2021/05/24
  • YP 3.3.1 release date 2021/06/04
  • YP 3.1.9 build date 2021/06/21
  • YP 3.1.9 release date 2021/07/02
  • YP 3.1.10 build date 2021/07/26
  • YP 3.1.10 release date 2021/08/06
  • YP 3.3.2 build date 2021/08/09
  • YP 3.3.2 release date 2021/08/20
  • YP 3.1.11 build date 2021/09/13
  • YP 3.1.11 release date 2021/9/24

 

Tracking Metrics:

 

The Yocto Project’s technical governance is through its Technical Steering Committee, more information is available at:

https://wiki.yoctoproject.org/wiki/TSC

 

The Status reports are now stored on the wiki at: https://wiki.yoctoproject.org/wiki/Weekly_Status

 

[If anyone has suggestions for other information you’d like to see on this weekly status update, let us know!]

 

Thanks,

 

Stephen K. Jolley

Yocto Project Program Manager

(    Cell:                (208) 244-4460

* Email:              sjolley.yp.pm@...

 


Re: [yocto-autobuilder2] [PATCH] config: Add meta-aws to base configuration

Richard Purdie
 

On Tue, 2021-04-13 at 14:59 +0100, Richard Purdie via lists.yoctoproject.org wrote:
Signed-off-by: Richard Purdie <richard.purdie@...>
---
 bsp-addition-example.patch | 54 --------------------------------------
 config.py | 3 +++
 2 files changed, 3 insertions(+), 54 deletions(-)
 delete mode 100644 bsp-addition-example.patch

diff --git a/bsp-addition-example.patch b/bsp-addition-example.patch
deleted file mode 100644
index 7f92789d..00000000
--- a/bsp-addition-example.patch
+++ /dev/null
Not sure what happened with the file deletion but I'll fix that.

Cheers,

Richard


[yocto-autobuilder2] [PATCH] config: Add meta-aws to base configuration

Richard Purdie
 

Signed-off-by: Richard Purdie <richard.purdie@...>
---
bsp-addition-example.patch | 54 --------------------------------------
config.py | 3 +++
2 files changed, 3 insertions(+), 54 deletions(-)
delete mode 100644 bsp-addition-example.patch

diff --git a/bsp-addition-example.patch b/bsp-addition-example.patch
deleted file mode 100644
index 7f92789d..00000000
--- a/bsp-addition-example.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From d5fb6c086c18722532333c8af1e19b42b9ffb138 Mon Sep 17 00:00:00 2001
-From: Aaron Chan <aaron.chun.yew.chan@...>
-Date: Tue, 28 Aug 2018 10:49:13 +0800
-Subject: [PATCH] config.py: Add new job category with suffix bsp
-
-Add new support on Open Source Automated Hardware Tests on BSP test
-cases. New job category is define with builder name standard as
-"nightly-<arch>-bsp" where Yocto Project supports architecutures on
-hardware platforms of x86, x86-64, arm, arm64, mips, mips64, pcc.
-
-Add initial support on x86-64 BSP hardware tests and included meta
-layers needed to run QA test cases on these platforms.
-Community to adopt and add support to autobuilder job config to
-support future BSP testing and validation on their architecture.
-
-Signed-off-by: Aaron Chan <aaron.chun.yew.chan@...>
----
- config.py | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/config.py b/config.py
-index 2568768..10f740d 100644
---- a/config.py
-+++ b/config.py
-@@ -11,6 +11,7 @@
- "nightly-oecore": ["oecore", "bitbake"],
- "nightly-checkuri": ["poky", "meta-qt4", "meta-qt3"],
- "nightly-check-layer": ["poky", "meta-mingw", "meta-gplv2"],
-+ "nightly-x86-64-bsp": ["poky", "meta-intel", "meta-openembedded", "meta-security", "meta-ros", "meta-browser"],
- "default": ["poky"]
- }
-
-@@ -32,7 +33,11 @@
- "meta-qt4": ["git://git.yoctoproject.org/meta-qt4", "master"],
- "meta-qt3": ["git://git.yoctoproject.org/meta-qt3", "master"],
- "meta-mingw": ["git://git.yoctoproject.org/meta-mingw", "master"],
-- "meta-gplv2": ["git://git.yoctoproject.org/meta-gplv2", "master"]
-+ "meta-gplv2": ["git://git.yoctoproject.org/meta-gplv2", "master"],
-+ "meta-security": ["git://git.yoctoproject.org/meta-security", "master"],
-+ "meta-openembedded": ["git://git.openembedded.org/meta-openembedded", "master"],
-+ "meta-ros": ["git://github.com/bmwcarit/meta-ros", "master"],
-+ "meta-browser": ["git://github.com/OSSystems/meta-browser", "master"]
- }
-
- trigger_builders_wait = [
-@@ -40,7 +45,7 @@
- "nightly-mips", "nightly-mips-lsb", "nightly-mips64",
- "nightly-multilib", "nightly-x32",
- "nightly-ppc", "nightly-ppc-lsb",
-- "nightly-x86-64", "nightly-x86-64-lsb",
-+ "nightly-x86-64", "nightly-x86-64-lsb", "nightly-x86-64-bsp",
- "nightly-x86", "nightly-x86-lsb",
- "nightly-packagemanagers",
- "nightly-rpm-non-rpm", "nightly-deb-non-deb",
diff --git a/config.py b/config.py
index 903cb4b8..54ec9ce8 100644
--- a/config.py
+++ b/config.py
@@ -19,6 +19,7 @@ buildertorepos = {
"meta-intel": ["poky", "meta-intel"],
"meta-arm": ["poky", "meta-arm", "meta-kernel"],
"meta-agl-core": ["poky", "meta-agl"],
+ "meta-aws": ["poky", "meta-aws", "meta-openembedded"],
"qemuarm-oecore": ["oecore", "bitbake"],
"checkuri": ["poky"],
"check-layer": ["poky", "meta-mingw", "meta-gplv2"],
@@ -40,6 +41,7 @@ repos = {
"meta-intel": ["git://git.yoctoproject.org/meta-intel", "master"],
"meta-arm": ["git://git.yoctoproject.org/meta-arm", "master"],
"meta-agl": ["https://git.automotivelinux.org/AGL/meta-agl", "next"],
+ "meta-aws": ["https://github.com/aws/meta-aws.git", "master"],
"oecore": ["git://git.openembedded.org/openembedded-core",
"master"],
"bitbake": ["git://git.openembedded.org/bitbake", "master"],
@@ -107,6 +109,7 @@ builders_others = [
"bringup",
"qemuarm-armhost",
"meta-agl-core",
+ "meta-aws",
"auh"
]

--
2.30.2


[yocto-autobuilder2] [PATCH] config/schedulers: Add hardknott config for new release

Richard Purdie
 

Signed-off-by: Richard Purdie <richard.purdie@...>
---
config.py | 1 +
schedulers.py | 14 ++++++++++++--
2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/config.py b/config.py
index 299f2aa5..903cb4b8 100644
--- a/config.py
+++ b/config.py
@@ -142,6 +142,7 @@ all_workers = workers + workers_bringup + workers_buildperf + workers_arm

# Worker filtering for older releases
workers_prev_releases = {
+ "hardknott" : ("centos7", "centos8", "debian8", "debian9", "debian10", "fedora31", "fedora32", "fedora33", "opensuse152", "ubuntu1604", "ubuntu1804", "ubuntu2004", "perf-"),
"gatesgarth" : ("centos7", "centos8", "debian8", "debian9", "debian10", "fedora30", "fedora31", "fedora32", "opensuse150", "opensuse151", "opensuse152", "ubuntu1604", "ubuntu1804", "ubuntu1904", "ubuntu2004", "perf-"),
"dunfell" : ("centos7", "centos8", "debian8", "debian9", "debian10", "fedora29", "fedora30", "fedora31", "fedora32", "opensuse150", "opensuse151", "ubuntu1604", "ubuntu1804", "ubuntu1904", "ubuntu2004", "perf-"),
"zeus" : ("centos7", "debian8", "debian9", "debian10", "fedora28", "fedora29", "fedora30", "opensuse150", "opensuse151", "ubuntu1604", "ubuntu1804", "ubuntu1904", "perf-"),
diff --git a/schedulers.py b/schedulers.py
index 84792909..b8a73f10 100644
--- a/schedulers.py
+++ b/schedulers.py
@@ -169,7 +169,7 @@ def parent_scheduler(target):
name="branchselector",
default="master",
label="Release Shortcut Selector",
- choices=["master", "master-next", "mut", "gatesgarth", "dunfell", "zeus", "warrior", "thud", "sumo", "rocko", "pyro", "morty"],
+ choices=["master", "master-next", "mut", "hardknott", "gatesgarth", "dunfell", "zeus", "warrior", "thud", "sumo", "rocko", "pyro", "morty"],
selectors={
'master': {
'branch': 'master',
@@ -202,6 +202,16 @@ def parent_scheduler(target):
'branch_meta-mingw': 'master',
'branch_oecore': 'master',
},
+ 'hardknott': {
+ 'branch': 'hardknott',
+ 'branch_poky': 'hardknott',
+ 'branch_bitbake': '1.50',
+ 'branch_meta-arm': 'hardknott',
+ 'branch_meta-gplv2': 'hardknott',
+ 'branch_meta-intel': 'hardknott',
+ 'branch_meta-mingw': 'hardknott',
+ 'branch_oecore': 'hardknott',
+ },
'gatesgarth': {
'branch': 'gatesgarth',
'branch_poky': 'gatesgarth',
@@ -354,7 +364,7 @@ schedulers.append(sched.Nightly(name='nightly-auh', branch='master', properties=

# If any of our sphinx docs branches change, trigger a build
schedulers.append(sched.AnyBranchScheduler(name="yocto-docs-changed",
- change_filter=util.ChangeFilter(project=["yocto-docs"], branch=["master", "master-next", "gatesgarth", "dunfell", "transition"]),
+ change_filter=util.ChangeFilter(project=["yocto-docs"], branch=["master", "master-next", "hardknott", "gatesgarth", "dunfell", "transition"]),
codebases = ['', 'yocto-docs', 'bitbake'],
treeStableTimer=60,
builderNames=["docs"]))
--
2.30.2


need Sysvinit as system manager in Rocko Version #rocko

rohit jadhav
 

I have created rootfs with Rocko yocto version.

I need sysyvinit as system manager instead of Systemd.

I have tried with following in local.conf

DISTRO_FEATURES_append = " sysvinit"

VIRTUAL-RUNTIME_init_manager = "sysvinit"

VIRTUAL-RUNTIME_initscripts = "initscripts"

It created run-level folder like rcS and rc0.d to rc6.d. but did not created inittab file in /etc .

And after booting it rootfs boots up with systemd only
root@imx6ull14x14evk:~# ps -p1 | grep "init\|upstart\|systemd"
    1 ?        00:00:07 systemd
I need init as system manager . can you please guide me in this regard.

Thank you

Regards
Rohit


Re: QA notification for completed autobuilder build (yocto-3.3.rc2)

Sangeeta Jain
 

Hello All,

This is the full report for yocto-3.3.rc2:
https://git.yoctoproject.org/cgit/cgit.cgi/yocto-testresults-contrib/tree/?h=intel-yocto-testresults

======= Summary ========
No high milestone defects.

No new issue found.


Thanks,
Sangeeta

-----Original Message-----
From: yocto@... <yocto@...> On Behalf
Of Pokybuild User
Sent: Wednesday, 7 April, 2021 8:16 PM
To: yocto@...
Cc: qa-build-notification@...
Subject: [yocto] QA notification for completed autobuilder build (yocto-3.3.rc2)


A build flagged for QA (yocto-3.3.rc2) was completed on the autobuilder and is
available at:


https://autobuilder.yocto.io/pub/releases/yocto-3.3.rc2


Build hash information:

bitbake: a1848a481e36b729c8e4130c394b1d462d4b488a
meta-arm: 219fd34b7676ffedd1a1ad3626ec4337391975f4
meta-gplv2: 9e119f333cc8f53bd3cf64326f826dbc6ce3db0f
meta-intel: 01cfc99a8f960917433a8a46b41bb4febb5b1993
meta-kernel: 29329d7cacc71595cecfdd05a455a0cfb164564d
meta-mingw: 422b96cb2b6116442be1f40dfb5bd77447d1219e
oecore: 14241ed09f9ed317045cf75a6d08416d3579bb8d
poky: e1839b58ebe05242a52fe050aa9a08140136aa0a



This is an automated message from the Yocto Project Autobuilder
Git: git://git.yoctoproject.org/yocto-autobuilder2
Email: richard.purdie@...



Re: [meta-cgl][PATCH] pacemaker: upgrade 2.0.3 -> 2.0.5

Jeremy Puhlman
 

I haven't been doing much with it lately and this got lost in my pile. Its merged to master.


On Mon, Apr 12, 2021 at 7:29 PM Randy MacLeod <randy.macleod@...> wrote:
On 2021-03-05 1:28 a.m., Changqing Li wrote:
> ping

Is this layer alive? :)

../Randy
>
> On 12/9/20 2:01 PM, Yi Zhao wrote:
>> Drop backported patches:
>> 0001-Mark-declaration-with-extern.patch
>> 0006-Fix-tools-Fix-definition-of-curses_indented_printf.patch
>>
>> Rebase patches:
>> 0001-Fix-python3-usage.patch
>> 0001-pacemaker-fix-compile-error-of-musl-libc.patch
>>
>> Remove /var/log directory in do_install and create /var/log/pacemaker
>> directory in volatile file.
>>
>> Signed-off-by: Yi Zhao<yi.zhao@...>
>> ---
>>   .../recipes-cgl/pacemaker/files/tmpfiles      |  3 +-
>>   .../recipes-cgl/pacemaker/files/volatiles     |  1 +
>>   .../pacemaker/0001-Fix-python3-usage.patch    | 34 ++++----------
>>   .../0001-Mark-declaration-with-extern.patch   | 46 -------------------
>>   ...maker-fix-compile-error-of-musl-libc.patch | 39 +++-------------
>>   ...definition-of-curses_indented_printf.patch | 30 ------------
>>   ...{pacemaker_2.0.3.bb => pacemaker_2.0.5.bb} |  5 +-
>>   7 files changed, 21 insertions(+), 137 deletions(-)
>>   mode change 100755 => 100644 meta-cgl-common/recipes-cgl/pacemaker/files/tmpfiles
>>   mode change 100755 => 100644 meta-cgl-common/recipes-cgl/pacemaker/files/volatiles
>>   delete mode 100644 meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-Mark-declaration-with-extern.patch
>>   delete mode 100644 meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0006-Fix-tools-Fix-definition-of-curses_indented_printf.patch
>>   rename meta-cgl-common/recipes-cgl/pacemaker/{pacemaker_2.0.3.bb => pacemaker_2.0.5.bb} (96%)
>>
>> diff --git a/meta-cgl-common/recipes-cgl/pacemaker/files/tmpfiles b/meta-cgl-common/recipes-cgl/pacemaker/files/tmpfiles
>> old mode 100755
>> new mode 100644
>> index 979db47..765ee0d
>> --- a/meta-cgl-common/recipes-cgl/pacemaker/files/tmpfiles
>> +++ b/meta-cgl-common/recipes-cgl/pacemaker/files/tmpfiles
>> @@ -3,4 +3,5 @@ d /var/lib/pacemaker/cib 0750 hacluster haclient -
>>   d /var/lib/pacemaker/cores 0750 hacluster haclient -
>>   d /var/lib/pacemaker/pengine 0750 hacluster haclient -
>>   d /var/lib/pacemaker/blackbox 0750 hacluster haclient -
>> -d /var/run/crm 0750 hacluster haclient -
>> +d /run/crm 0750 hacluster haclient -
>> +d /var/log/pacemaker 0750 hacluster haclient -
>> diff --git a/meta-cgl-common/recipes-cgl/pacemaker/files/volatiles b/meta-cgl-common/recipes-cgl/pacemaker/files/volatiles
>> old mode 100755
>> new mode 100644
>> index 1700a69..eca3002
>> --- a/meta-cgl-common/recipes-cgl/pacemaker/files/volatiles
>> +++ b/meta-cgl-common/recipes-cgl/pacemaker/files/volatiles
>> @@ -4,3 +4,4 @@ d hacluster haclient 0750 /var/lib/pacemaker/cores none
>>   d hacluster haclient 0750 /var/lib/pacemaker/pengine none
>>   d hacluster haclient 0750 /var/lib/pacemaker/blackbox none
>>   d hacluster haclient 0750 /var/run/crm none
>> +d hacluster haclient 0750 /var/log/pacemaker none
>> diff --git a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-Fix-python3-usage.patch b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-Fix-python3-usage.patch
>> index 05d7a76..2095227 100644
>> --- a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-Fix-python3-usage.patch
>> +++ b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-Fix-python3-usage.patch
>> @@ -1,4 +1,4 @@
>> -From fdefa9efc726fe704238d462a3dc207e0282fb9e Mon Sep 17 00:00:00 2001
>> +From f470884e0b990676685c8740b5c7d6f094267e4f Mon Sep 17 00:00:00 2001
>>   From: Jeremy Puhlman<jpuhlman@...>
>>   Date: Sun, 15 Mar 2020 21:09:33 +0000
>>   Subject: [PATCH] Fix python3 usage
>> @@ -18,12 +18,11 @@ Upstream-Status: Pending
>>    cts/pacemaker-cts-dummyd.in                   | 2 +-
>>    daemons/fenced/fence_legacy.in                | 2 +-
>>    doc/Pacemaker_Development/en-US/Ch-Python.txt | 2 +-
>> - doc/Pacemaker_Development/pot/Ch-Python.pot   | 2 +-
>>    tools/pcmk_simtimes.in                        | 2 +-
>> - 14 files changed, 14 insertions(+), 14 deletions(-)
>> + 13 files changed, 13 insertions(+), 13 deletions(-)
>>   
>>   diff --git a/cts/CTSlab.py.in b/cts/CTSlab.py.in
>> -index f4ae60dc1..55a0d4ecf 100644
>> +index 4bae93515..f09f71c66 100644
>>   --- a/cts/CTSlab.py.in
>>   +++ b/cts/CTSlab.py.in
>>   @@ -1,4 +1,4 @@
>> @@ -43,10 +42,10 @@ index 81a5da8c0..bbadf938a 100644
>>    '''OCF IPaddr/IPaddr2 Resource Agent Test'''
>>   
>>   diff --git a/cts/cluster_test.in b/cts/cluster_test.in
>> -index e0d28509d..f982be05a 100755
>> +index 38f941d3e..5a289e3fc 100755
>>   --- a/cts/cluster_test.in
>>   +++ b/cts/cluster_test.in
>> -@@ -171,4 +171,4 @@ printf "\nAll set to go for %d iterations!\n" "$CTS_numtests"
>> +@@ -172,4 +172,4 @@ printf "\nAll set to go for %d iterations!\n" "$CTS_numtests"
>>        || echo "+ To use a different configuration, remove ~/.cts and re-run cts (or edit it manually)."
>>   
>>    echo Now paste the following command into this shell:
>> @@ -63,7 +62,7 @@ index 592d850b4..9a653a442 100644
>>    """
>>   
>>   diff --git a/cts/cts-fencing.in b/cts/cts-fencing.in
>> -index 2d9999ca0..8e3fb7203 100644
>> +index 444402438..0270c99ce 100644
>>   --- a/cts/cts-fencing.in
>>   +++ b/cts/cts-fencing.in
>>   @@ -1,4 +1,4 @@
>> @@ -83,7 +82,7 @@ index 28f4efe7f..b4ed5024f 100644
>>   
>>    Reads a specified number of lines from the supplied offset
>>   diff --git a/cts/cts-scheduler.in b/cts/cts-scheduler.in
>> -index 8fa16fb69..d4306b02b 100644
>> +index 23e6a919f..09058ce22 100644
>>   --- a/cts/cts-scheduler.in
>>   +++ b/cts/cts-scheduler.in
>>   @@ -1,4 +1,4 @@
>> @@ -93,7 +92,7 @@ index 8fa16fb69..d4306b02b 100644
>>    """
>>   
>>   diff --git a/cts/environment.py b/cts/environment.py
>> -index db9d3db16..9d103fda9 100644
>> +index 6a97b1289..39e89fa6f 100644
>>   --- a/cts/environment.py
>>   +++ b/cts/environment.py
>>   @@ -639,7 +639,7 @@ class Environment(object):
>> @@ -106,7 +105,7 @@ index db9d3db16..9d103fda9 100644
>>   
>>            sys.exit(status)
>>   diff --git a/cts/fence_dummy.in b/cts/fence_dummy.in
>> -index a2692b1e0..f1d111205 100644
>> +index 8b0dd5165..9e8624bd9 100644
>>   --- a/cts/fence_dummy.in
>>   +++ b/cts/fence_dummy.in
>>   @@ -1,4 +1,4 @@
>> @@ -148,19 +147,6 @@ index 42d35b649..467e1c524 100644
>>    ----
>>    ====
>>    which will be replaced with the appropriate python executable when Pacemaker is
>> -diff --git a/doc/Pacemaker_Development/pot/Ch-Python.pot b/doc/Pacemaker_Development/pot/Ch-Python.pot
>> -index ed71331ce..27c7e22e5 100644
>> ---- a/doc/Pacemaker_Development/pot/Ch-Python.pot
>> -+++ b/doc/Pacemaker_Development/pot/Ch-Python.pot
>> -@@ -39,7 +39,7 @@ msgstr ""
>> -
>> - #. Tag: screen
>> - #, no-c-format
>> --msgid "#!@PYTHON@"
>> -+msgid "#!/usr/bin/env python3"
>> - msgstr ""
>> -
>> - #. Tag: para
>>   diff --git a/tools/pcmk_simtimes.in b/tools/pcmk_simtimes.in
>>   index 6e362243b..28009f499 100644
>>   --- a/tools/pcmk_simtimes.in
>> @@ -172,5 +158,5 @@ index 6e362243b..28009f499 100644
>>    """
>>   
>>   --
>> -2.23.0
>> +2.17.1
>>   
>> diff --git a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-Mark-declaration-with-extern.patch b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-Mark-declaration-with-extern.patch
>> deleted file mode 100644
>> index 5729447..0000000
>> --- a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-Mark-declaration-with-extern.patch
>> +++ /dev/null
>> @@ -1,46 +0,0 @@
>> -From e1abd3b7c7a0122813e4d0abdb079df10104882c Mon Sep 17 00:00:00 2001
>> -From: Mingli Yu<mingli.yu@...>
>> -Date: Thu, 3 Sep 2020 04:44:09 +0000
>> -Subject: [PATCH] Mark declaration with extern
>> -
>> -Fixes build with gcc 10+
>> -
>> -Upstream-Status: Pending
>> -
>> -Signed-off-by: Mingli Yu<mingli.yu@...>
>> ----
>> - daemons/attrd/pacemaker-attrd.h | 4 ++--
>> - daemons/execd/pacemaker-execd.h | 2 +-
>> - 2 files changed, 3 insertions(+), 3 deletions(-)
>> -
>> -diff --git a/daemons/attrd/pacemaker-attrd.h b/daemons/attrd/pacemaker-attrd.h
>> -index cc8e29ee1..76778915e 100644
>> ---- a/daemons/attrd/pacemaker-attrd.h
>> -+++ b/daemons/attrd/pacemaker-attrd.h
>> -@@ -106,8 +106,8 @@ typedef struct attribute_value_s {
>> -         gboolean seen;
>> - } attribute_value_t;
>> -
>> --crm_cluster_t *attrd_cluster;
>> --GHashTable *attributes;
>> -+extern crm_cluster_t *attrd_cluster;
>> -+extern GHashTable *attributes;
>> -
>> - #define attrd_send_ack(client, id, flags) \
>> -     crm_ipcs_send_ack((client), (id), (flags), "ack", __FUNCTION__, __LINE__)
>> -diff --git a/daemons/execd/pacemaker-execd.h b/daemons/execd/pacemaker-execd.h
>> -index 4a52d9183..dab3ccdbe 100644
>> ---- a/daemons/execd/pacemaker-execd.h
>> -+++ b/daemons/execd/pacemaker-execd.h
>> -@@ -20,7 +20,7 @@
>> - #    include <gnutls/gnutls.h>
>> - #  endif
>> -
>> --GHashTable *rsc_list;
>> -+extern GHashTable *rsc_list;
>> -
>> - typedef struct lrmd_rsc_s {
>> -     char *rsc_id;
>> ---
>> -2.26.2
>> -
>> diff --git a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-pacemaker-fix-compile-error-of-musl-libc.patch b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-pacemaker-fix-compile-error-of-musl-libc.patch
>> index f8cbb7e..a10e8cd 100644
>> --- a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-pacemaker-fix-compile-error-of-musl-libc.patch
>> +++ b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-pacemaker-fix-compile-error-of-musl-libc.patch
>> @@ -1,4 +1,4 @@
>> -From 51b0df9242bb1e3eb41362381472a00727910f64 Mon Sep 17 00:00:00 2001
>> +From ba9e4810a09893521d28f6c699fb7f213d4a4b34 Mon Sep 17 00:00:00 2001
>>   From: Changqing Li<changqing.li@...>
>>   Date: Fri, 10 Aug 2018 15:08:31 +0800
>>   Subject: [PATCH] pacemaker: fix compile error of musl libc
>> @@ -7,28 +7,14 @@ Upstream-Status: Pending
>>   
>>   Signed-off-by: Changqing Li<changqing.li@...>
>>   ---
>> - include/crm/stonith-ng.h | 1 +
>> - lib/cib/cib_remote.c     | 3 ---
>> - tools/crm_mon.c          | 2 +-
>> - 3 files changed, 2 insertions(+), 4 deletions(-)
>> + lib/cib/cib_remote.c | 3 ---
>> + 1 file changed, 3 deletions(-)
>>   
>> -diff --git a/include/crm/stonith-ng.h b/include/crm/stonith-ng.h
>> -index 56c1ec7..a637b47 100644
>> ---- a/include/crm/stonith-ng.h
>> -+++ b/include/crm/stonith-ng.h
>> -@@ -28,6 +28,7 @@
>> - #  include <dlfcn.h>
>> - #  include <errno.h>
>> - #  include <stdbool.h>
>> -+#  include <time.h>
>> -
>> - /* TO-DO: Work out how to drop this requirement */
>> - #  include <libxml/tree.h>
>>   diff --git a/lib/cib/cib_remote.c b/lib/cib/cib_remote.c
>> -index 4d7b93b..8be8ecc 100644
>> +index 4de0a0f7b..7686637db 100644
>>   --- a/lib/cib/cib_remote.c
>>   +++ b/lib/cib/cib_remote.c
>> -@@ -53,9 +53,6 @@ typedef void gnutls_session_t;
>> +@@ -45,9 +45,6 @@ typedef void gnutls_session_t;
>>    #endif
>>   
>>    #include <arpa/inet.h>
>> @@ -38,19 +24,6 @@ index 4d7b93b..8be8ecc 100644
>>   
>>    #define DH_BITS 1024
>>   
>> -diff --git a/tools/crm_mon.c b/tools/crm_mon.c
>> -index 7c63803..1ae6c21 100644
>> ---- a/tools/crm_mon.c
>> -+++ b/tools/crm_mon.c
>> -@@ -553,7 +553,7 @@ main(int argc, char **argv)
>> -
>> - #if !defined (ON_DARWIN) && !defined (ON_BSD)
>> -     /* prevent zombies */
>> --    signal(SIGCLD, SIG_IGN);
>> -+    signal(SIGCHLD, SIG_IGN);
>> - #endif
>> -
>> -     if (crm_ends_with_ext(argv[0], ".cgi") == TRUE) {
>>   --
>> -2.7.4
>> +2.17.1
>>   
>> diff --git a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0006-Fix-tools-Fix-definition-of-curses_indented_printf.patch b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0006-Fix-tools-Fix-definition-of-curses_indented_printf.patch
>> deleted file mode 100644
>> index f5e1829..0000000
>> --- a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0006-Fix-tools-Fix-definition-of-curses_indented_printf.patch
>> +++ /dev/null
>> @@ -1,30 +0,0 @@
>> -From 426f06cc088d11d6db0c45b434e5ce6b69da78b4 Mon Sep 17 00:00:00 2001
>> -From: Chris Lumens<clumens@...>
>> -Date: Thu, 2 Jan 2020 15:08:58 -0500
>> -Subject: [PATCH 006/207] Fix: tools: Fix definition of curses_indented_printf.
>> -
>> -The placeholder version that is built if curses is not enabled does not
>> -have a type that matches the header file.  Correct that.
>> -
>> -Signed-off-by: Jeremy A. Puhlman<jpuhlman@...>
>> -Upstream-Status: Backport[git]
>> ----
>> - tools/crm_mon_curses.c | 2 +-
>> - 1 file changed, 1 insertion(+), 1 deletion(-)
>> -
>> -diff --git a/tools/crm_mon_curses.c b/tools/crm_mon_curses.c
>> -index c0dbedbf0..ecd0584fe 100644
>> ---- a/tools/crm_mon_curses.c
>> -+++ b/tools/crm_mon_curses.c
>> -@@ -368,7 +368,7 @@ curses_indented_vprintf(pcmk__output_t *out, const char *format, va_list args) {
>> -
>> - G_GNUC_PRINTF(2, 3)
>> - void
>> --curses_indented_printf(pcmk__output_t *out, const char *format, va_list args) {
>> -+curses_indented_printf(pcmk__output_t *out, const char *format, ...) {
>> -     return;
>> - }
>> -
>> ---
>> -2.23.0
>> -
>> diff --git a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_2.0.3.bb b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_2.0.5.bb
>> similarity index 96%
>> rename from meta-cgl-common/recipes-cgl/pacemaker/pacemaker_2.0.3.bb
>> rename to meta-cgl-common/recipes-cgl/pacemaker/pacemaker_2.0.5.bb
>> index 8576f18..6cfa057 100644
>> --- a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_2.0.3.bb
>> +++ b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_2.0.5.bb
>> @@ -14,9 +14,7 @@ LIC_FILES_CHKSUM ="file://COPYING;md5=000212f361a81b100d9d0f0435040663"
>>   DEPENDS = "corosync libxslt libxml2 gnutls resource-agents libqb python3-native"
>>   
>>   SRC_URI = "git://github.com/ClusterLabs/${BPN}.git \
>> -file://0006-Fix-tools-Fix-definition-of-curses_indented_printf.patch  \
>>              file://0001-Fix-python3-usage.patch  \
>> -file://0001-Mark-declaration-with-extern.patch  \
>>              file://0001-pacemaker-set-OCF_ROOT_DIR-to-libdir-ocf.patch  \
>>              file://volatiles  \
>>              file://tmpfiles  \
>> @@ -26,7 +24,7 @@ CFLAGS += "-I${STAGING_INCDIR}/heartbeat"
>>   CPPFLAGS +="-I${STAGING_INCDIR}/heartbeat"
>>   SRC_URI_append_libc-musl ="file://0001-pacemaker-fix-compile-error-of-musl-libc.patch"
>>   
>> -SRCREV = "4b1f869f0f64ef0d248b6aa4781d38ecccf83318"
>> +SRCREV = "ba59be71228fed04f78ab374dfac748d314d0e89"
>>   
>>   inherit autotools-brokensep pkgconfig systemd python3native python3-dir useradd
>>   
>> @@ -78,6 +76,7 @@ do_install_append() {
>>   
>>       rm -rf ${D}${localstatedir}/lib/heartbeat
>>       rm -rf ${D}${localstatedir}/run
>> +    rm -rf ${D}${localstatedir}/log
>>   
>>       # remove buildpath
>>       tempdirs=$(grep -Rn ${RECIPE_SYSROOT_NATIVE} ${D}/* | awk -F: '{print $1}' | uniq)
>>
>
>
>
>


--
# Randy MacLeod
# Wind River Linux


--
Jeremy Puhlman
Montavista Software, LLC.


Re: [meta-cgl][PATCH] pacemaker: upgrade 2.0.3 -> 2.0.5

Randy MacLeod
 

On 2021-03-05 1:28 a.m., Changqing Li wrote:
ping
Is this layer alive? :)

../Randy
On 12/9/20 2:01 PM, Yi Zhao wrote:
Drop backported patches:
0001-Mark-declaration-with-extern.patch
0006-Fix-tools-Fix-definition-of-curses_indented_printf.patch

Rebase patches:
0001-Fix-python3-usage.patch
0001-pacemaker-fix-compile-error-of-musl-libc.patch

Remove /var/log directory in do_install and create /var/log/pacemaker
directory in volatile file.

Signed-off-by: Yi Zhao<yi.zhao@...>
---
.../recipes-cgl/pacemaker/files/tmpfiles | 3 +-
.../recipes-cgl/pacemaker/files/volatiles | 1 +
.../pacemaker/0001-Fix-python3-usage.patch | 34 ++++----------
.../0001-Mark-declaration-with-extern.patch | 46 -------------------
...maker-fix-compile-error-of-musl-libc.patch | 39 +++-------------
...definition-of-curses_indented_printf.patch | 30 ------------
...{pacemaker_2.0.3.bb => pacemaker_2.0.5.bb} | 5 +-
7 files changed, 21 insertions(+), 137 deletions(-)
mode change 100755 => 100644 meta-cgl-common/recipes-cgl/pacemaker/files/tmpfiles
mode change 100755 => 100644 meta-cgl-common/recipes-cgl/pacemaker/files/volatiles
delete mode 100644 meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-Mark-declaration-with-extern.patch
delete mode 100644 meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0006-Fix-tools-Fix-definition-of-curses_indented_printf.patch
rename meta-cgl-common/recipes-cgl/pacemaker/{pacemaker_2.0.3.bb => pacemaker_2.0.5.bb} (96%)

diff --git a/meta-cgl-common/recipes-cgl/pacemaker/files/tmpfiles b/meta-cgl-common/recipes-cgl/pacemaker/files/tmpfiles
old mode 100755
new mode 100644
index 979db47..765ee0d
--- a/meta-cgl-common/recipes-cgl/pacemaker/files/tmpfiles
+++ b/meta-cgl-common/recipes-cgl/pacemaker/files/tmpfiles
@@ -3,4 +3,5 @@ d /var/lib/pacemaker/cib 0750 hacluster haclient -
d /var/lib/pacemaker/cores 0750 hacluster haclient -
d /var/lib/pacemaker/pengine 0750 hacluster haclient -
d /var/lib/pacemaker/blackbox 0750 hacluster haclient -
-d /var/run/crm 0750 hacluster haclient -
+d /run/crm 0750 hacluster haclient -
+d /var/log/pacemaker 0750 hacluster haclient -
diff --git a/meta-cgl-common/recipes-cgl/pacemaker/files/volatiles b/meta-cgl-common/recipes-cgl/pacemaker/files/volatiles
old mode 100755
new mode 100644
index 1700a69..eca3002
--- a/meta-cgl-common/recipes-cgl/pacemaker/files/volatiles
+++ b/meta-cgl-common/recipes-cgl/pacemaker/files/volatiles
@@ -4,3 +4,4 @@ d hacluster haclient 0750 /var/lib/pacemaker/cores none
d hacluster haclient 0750 /var/lib/pacemaker/pengine none
d hacluster haclient 0750 /var/lib/pacemaker/blackbox none
d hacluster haclient 0750 /var/run/crm none
+d hacluster haclient 0750 /var/log/pacemaker none
diff --git a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-Fix-python3-usage.patch b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-Fix-python3-usage.patch
index 05d7a76..2095227 100644
--- a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-Fix-python3-usage.patch
+++ b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-Fix-python3-usage.patch
@@ -1,4 +1,4 @@
-From fdefa9efc726fe704238d462a3dc207e0282fb9e Mon Sep 17 00:00:00 2001
+From f470884e0b990676685c8740b5c7d6f094267e4f Mon Sep 17 00:00:00 2001
From: Jeremy Puhlman<jpuhlman@...>
Date: Sun, 15 Mar 2020 21:09:33 +0000
Subject: [PATCH] Fix python3 usage
@@ -18,12 +18,11 @@ Upstream-Status: Pending
cts/pacemaker-cts-dummyd.in | 2 +-
daemons/fenced/fence_legacy.in | 2 +-
doc/Pacemaker_Development/en-US/Ch-Python.txt | 2 +-
- doc/Pacemaker_Development/pot/Ch-Python.pot | 2 +-
tools/pcmk_simtimes.in | 2 +-
- 14 files changed, 14 insertions(+), 14 deletions(-)
+ 13 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/cts/CTSlab.py.in b/cts/CTSlab.py.in
-index f4ae60dc1..55a0d4ecf 100644
+index 4bae93515..f09f71c66 100644
--- a/cts/CTSlab.py.in
+++ b/cts/CTSlab.py.in
@@ -1,4 +1,4 @@
@@ -43,10 +42,10 @@ index 81a5da8c0..bbadf938a 100644
'''OCF IPaddr/IPaddr2 Resource Agent Test'''
diff --git a/cts/cluster_test.in b/cts/cluster_test.in
-index e0d28509d..f982be05a 100755
+index 38f941d3e..5a289e3fc 100755
--- a/cts/cluster_test.in
+++ b/cts/cluster_test.in
-@@ -171,4 +171,4 @@ printf "\nAll set to go for %d iterations!\n" "$CTS_numtests"
+@@ -172,4 +172,4 @@ printf "\nAll set to go for %d iterations!\n" "$CTS_numtests"
|| echo "+ To use a different configuration, remove ~/.cts and re-run cts (or edit it manually)."
echo Now paste the following command into this shell:
@@ -63,7 +62,7 @@ index 592d850b4..9a653a442 100644
"""
diff --git a/cts/cts-fencing.in b/cts/cts-fencing.in
-index 2d9999ca0..8e3fb7203 100644
+index 444402438..0270c99ce 100644
--- a/cts/cts-fencing.in
+++ b/cts/cts-fencing.in
@@ -1,4 +1,4 @@
@@ -83,7 +82,7 @@ index 28f4efe7f..b4ed5024f 100644
Reads a specified number of lines from the supplied offset
diff --git a/cts/cts-scheduler.in b/cts/cts-scheduler.in
-index 8fa16fb69..d4306b02b 100644
+index 23e6a919f..09058ce22 100644
--- a/cts/cts-scheduler.in
+++ b/cts/cts-scheduler.in
@@ -1,4 +1,4 @@
@@ -93,7 +92,7 @@ index 8fa16fb69..d4306b02b 100644
"""
diff --git a/cts/environment.py b/cts/environment.py
-index db9d3db16..9d103fda9 100644
+index 6a97b1289..39e89fa6f 100644
--- a/cts/environment.py
+++ b/cts/environment.py
@@ -639,7 +639,7 @@ class Environment(object):
@@ -106,7 +105,7 @@ index db9d3db16..9d103fda9 100644
sys.exit(status)
diff --git a/cts/fence_dummy.in b/cts/fence_dummy.in
-index a2692b1e0..f1d111205 100644
+index 8b0dd5165..9e8624bd9 100644
--- a/cts/fence_dummy.in
+++ b/cts/fence_dummy.in
@@ -1,4 +1,4 @@
@@ -148,19 +147,6 @@ index 42d35b649..467e1c524 100644
----
====
which will be replaced with the appropriate python executable when Pacemaker is
-diff --git a/doc/Pacemaker_Development/pot/Ch-Python.pot b/doc/Pacemaker_Development/pot/Ch-Python.pot
-index ed71331ce..27c7e22e5 100644
---- a/doc/Pacemaker_Development/pot/Ch-Python.pot
-+++ b/doc/Pacemaker_Development/pot/Ch-Python.pot
-@@ -39,7 +39,7 @@ msgstr ""
-
- #. Tag: screen
- #, no-c-format
--msgid "#!@PYTHON@"
-+msgid "#!/usr/bin/env python3"
- msgstr ""
-
- #. Tag: para
diff --git a/tools/pcmk_simtimes.in b/tools/pcmk_simtimes.in
index 6e362243b..28009f499 100644
--- a/tools/pcmk_simtimes.in
@@ -172,5 +158,5 @@ index 6e362243b..28009f499 100644
"""
--
-2.23.0
+2.17.1
diff --git a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-Mark-declaration-with-extern.patch b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-Mark-declaration-with-extern.patch
deleted file mode 100644
index 5729447..0000000
--- a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-Mark-declaration-with-extern.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From e1abd3b7c7a0122813e4d0abdb079df10104882c Mon Sep 17 00:00:00 2001
-From: Mingli Yu<mingli.yu@...>
-Date: Thu, 3 Sep 2020 04:44:09 +0000
-Subject: [PATCH] Mark declaration with extern
-
-Fixes build with gcc 10+
-
-Upstream-Status: Pending
-
-Signed-off-by: Mingli Yu<mingli.yu@...>
----
- daemons/attrd/pacemaker-attrd.h | 4 ++--
- daemons/execd/pacemaker-execd.h | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/daemons/attrd/pacemaker-attrd.h b/daemons/attrd/pacemaker-attrd.h
-index cc8e29ee1..76778915e 100644
---- a/daemons/attrd/pacemaker-attrd.h
-+++ b/daemons/attrd/pacemaker-attrd.h
-@@ -106,8 +106,8 @@ typedef struct attribute_value_s {
- gboolean seen;
- } attribute_value_t;
-
--crm_cluster_t *attrd_cluster;
--GHashTable *attributes;
-+extern crm_cluster_t *attrd_cluster;
-+extern GHashTable *attributes;
-
- #define attrd_send_ack(client, id, flags) \
- crm_ipcs_send_ack((client), (id), (flags), "ack", __FUNCTION__, __LINE__)
-diff --git a/daemons/execd/pacemaker-execd.h b/daemons/execd/pacemaker-execd.h
-index 4a52d9183..dab3ccdbe 100644
---- a/daemons/execd/pacemaker-execd.h
-+++ b/daemons/execd/pacemaker-execd.h
-@@ -20,7 +20,7 @@
- # include <gnutls/gnutls.h>
- # endif
-
--GHashTable *rsc_list;
-+extern GHashTable *rsc_list;
-
- typedef struct lrmd_rsc_s {
- char *rsc_id;
---
-2.26.2
-
diff --git a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-pacemaker-fix-compile-error-of-musl-libc.patch b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-pacemaker-fix-compile-error-of-musl-libc.patch
index f8cbb7e..a10e8cd 100644
--- a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-pacemaker-fix-compile-error-of-musl-libc.patch
+++ b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-pacemaker-fix-compile-error-of-musl-libc.patch
@@ -1,4 +1,4 @@
-From 51b0df9242bb1e3eb41362381472a00727910f64 Mon Sep 17 00:00:00 2001
+From ba9e4810a09893521d28f6c699fb7f213d4a4b34 Mon Sep 17 00:00:00 2001
From: Changqing Li<changqing.li@...>
Date: Fri, 10 Aug 2018 15:08:31 +0800
Subject: [PATCH] pacemaker: fix compile error of musl libc
@@ -7,28 +7,14 @@ Upstream-Status: Pending
Signed-off-by: Changqing Li<changqing.li@...>
---
- include/crm/stonith-ng.h | 1 +
- lib/cib/cib_remote.c | 3 ---
- tools/crm_mon.c | 2 +-
- 3 files changed, 2 insertions(+), 4 deletions(-)
+ lib/cib/cib_remote.c | 3 ---
+ 1 file changed, 3 deletions(-)
-diff --git a/include/crm/stonith-ng.h b/include/crm/stonith-ng.h
-index 56c1ec7..a637b47 100644
---- a/include/crm/stonith-ng.h
-+++ b/include/crm/stonith-ng.h
-@@ -28,6 +28,7 @@
- # include <dlfcn.h>
- # include <errno.h>
- # include <stdbool.h>
-+# include <time.h>
-
- /* TO-DO: Work out how to drop this requirement */
- # include <libxml/tree.h>
diff --git a/lib/cib/cib_remote.c b/lib/cib/cib_remote.c
-index 4d7b93b..8be8ecc 100644
+index 4de0a0f7b..7686637db 100644
--- a/lib/cib/cib_remote.c
+++ b/lib/cib/cib_remote.c
-@@ -53,9 +53,6 @@ typedef void gnutls_session_t;
+@@ -45,9 +45,6 @@ typedef void gnutls_session_t;
#endif
#include <arpa/inet.h>
@@ -38,19 +24,6 @@ index 4d7b93b..8be8ecc 100644
#define DH_BITS 1024
-diff --git a/tools/crm_mon.c b/tools/crm_mon.c
-index 7c63803..1ae6c21 100644
---- a/tools/crm_mon.c
-+++ b/tools/crm_mon.c
-@@ -553,7 +553,7 @@ main(int argc, char **argv)
-
- #if !defined (ON_DARWIN) && !defined (ON_BSD)
- /* prevent zombies */
-- signal(SIGCLD, SIG_IGN);
-+ signal(SIGCHLD, SIG_IGN);
- #endif
-
- if (crm_ends_with_ext(argv[0], ".cgi") == TRUE) {
--
-2.7.4
+2.17.1
diff --git a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0006-Fix-tools-Fix-definition-of-curses_indented_printf.patch b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0006-Fix-tools-Fix-definition-of-curses_indented_printf.patch
deleted file mode 100644
index f5e1829..0000000
--- a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0006-Fix-tools-Fix-definition-of-curses_indented_printf.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 426f06cc088d11d6db0c45b434e5ce6b69da78b4 Mon Sep 17 00:00:00 2001
-From: Chris Lumens<clumens@...>
-Date: Thu, 2 Jan 2020 15:08:58 -0500
-Subject: [PATCH 006/207] Fix: tools: Fix definition of curses_indented_printf.
-
-The placeholder version that is built if curses is not enabled does not
-have a type that matches the header file. Correct that.
-
-Signed-off-by: Jeremy A. Puhlman<jpuhlman@...>
-Upstream-Status: Backport[git]
----
- tools/crm_mon_curses.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/crm_mon_curses.c b/tools/crm_mon_curses.c
-index c0dbedbf0..ecd0584fe 100644
---- a/tools/crm_mon_curses.c
-+++ b/tools/crm_mon_curses.c
-@@ -368,7 +368,7 @@ curses_indented_vprintf(pcmk__output_t *out, const char *format, va_list args) {
-
- G_GNUC_PRINTF(2, 3)
- void
--curses_indented_printf(pcmk__output_t *out, const char *format, va_list args) {
-+curses_indented_printf(pcmk__output_t *out, const char *format, ...) {
- return;
- }
-
---
-2.23.0
-
diff --git a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_2.0.3.bb b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_2.0.5.bb
similarity index 96%
rename from meta-cgl-common/recipes-cgl/pacemaker/pacemaker_2.0.3.bb
rename to meta-cgl-common/recipes-cgl/pacemaker/pacemaker_2.0.5.bb
index 8576f18..6cfa057 100644
--- a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_2.0.3.bb
+++ b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_2.0.5.bb
@@ -14,9 +14,7 @@ LIC_FILES_CHKSUM ="file://COPYING;md5=000212f361a81b100d9d0f0435040663"
DEPENDS = "corosync libxslt libxml2 gnutls resource-agents libqb python3-native"
SRC_URI = "git://github.com/ClusterLabs/${BPN}.git \
-file://0006-Fix-tools-Fix-definition-of-curses_indented_printf.patch \
file://0001-Fix-python3-usage.patch \
-file://0001-Mark-declaration-with-extern.patch \
file://0001-pacemaker-set-OCF_ROOT_DIR-to-libdir-ocf.patch \
file://volatiles \
file://tmpfiles \
@@ -26,7 +24,7 @@ CFLAGS += "-I${STAGING_INCDIR}/heartbeat"
CPPFLAGS +="-I${STAGING_INCDIR}/heartbeat"
SRC_URI_append_libc-musl ="file://0001-pacemaker-fix-compile-error-of-musl-libc.patch"
-SRCREV = "4b1f869f0f64ef0d248b6aa4781d38ecccf83318"
+SRCREV = "ba59be71228fed04f78ab374dfac748d314d0e89"
inherit autotools-brokensep pkgconfig systemd python3native python3-dir useradd
@@ -78,6 +76,7 @@ do_install_append() {
rm -rf ${D}${localstatedir}/lib/heartbeat
rm -rf ${D}${localstatedir}/run
+ rm -rf ${D}${localstatedir}/log
# remove buildpath
tempdirs=$(grep -Rn ${RECIPE_SYSROOT_NATIVE} ${D}/* | awk -F: '{print $1}' | uniq)

--
# Randy MacLeod
# Wind River Linux


M+ & H bugs with Milestone Movements WW15

Stephen Jolley
 

All,

YP M+ or high bugs which moved to a new milestone in WW15 are listed below:

Priority

Bug ID

Short Description

Changer

Owner

Was

Became

Medium+

5389

bitbake/lib/bb/fetch2: filename too long

randy.macleod@...

unassigned@...

3.3 M4

3.4 M1

 

10061

Ctrl+C during BB_HASHCHECK_FUNCTION execution does not interrupt processing nicely

randy.macleod@...

unassigned@...

3.3 M4

3.4 M1

 

12023

bitbake-layers show-layers doesn't show layer if it doesn't append itself to BBFILE_COLLECTIONS

randy.macleod@...

unassigned@...

3.3 M4

3.4 M1

 

12290

cross recipe kernel module dependency generation stopped working

randy.macleod@...

unassigned@...

3.3 M4

3.4 M1

 

12367

moving or removing tmp breaks persistent bitbake server

randy.macleod@...

unassigned@...

3.3 M4

3.4 M1

 

13054

oe-selftest oelib.utils.TestMultiprocessLaunch.test_multiprocesslaunch failure

randy.macleod@...

trevor.gamblin@...

3.3 M4

3.4 M1

 

13123

package.PackageTests.test_gdb_hardlink_debug failed

randy.macleod@...

randy.macleod@...

3.3 M4

3.4 M1

 

13288

pseudo should not follow symlinks in /proc

randy.macleod@...

sakib.sajal@...

3.3 M1

3.4 M1

 

13802

ltp tests fail with ssh connection lost  error intermittently

randy.macleod@...

sakib.sajal@...

3.3 M4

3.4 M1

 

13897

POSTINST_INTERCEPTS_DIR broken by undocumented POSTINST_INTERCEPTS_PATHS since thud

randy.macleod@...

unassigned@...

3.3 M4

3.4 M1

 

13910

Intermittent host UID contamination highlighted by devtool tests

randy.macleod@...

unassigned@...

3.3 M4

3.4 M1

 

13920

uninative tarball license compliance in ESDK

randy.macleod@...

unassigned@...

3.3 M4

3.4 M1

 

13935

Intermittent  taskhash mismatch errors on autobuilder

randy.macleod@...

JPEWhacker@...

3.3 M4

3.4 M1

 

13950

Intermittent qemu connection failures during oe-selftest on autobuilder

randy.macleod@...

sakib.sajal@...

3.3 M4

3.4 M1

 

13976

gdb8.3 do compile with musl is error

randy.macleod@...

unassigned@...

3.3 M4

3.4 M1

 

13992

qemumips testimage keeps failing

randy.macleod@...

victor.kamensky7@...

3.3 M4

3.4 M1

 

13999

do_packagedata setscene file race

randy.macleod@...

ross@...

3.3 M4

3.4 M1

 

14002

ssh connection failure during stap testing on qemuarm

randy.macleod@...

saul.wold@...

3.3 M4

3.4 M1

 

14010

qemumips-alt systemd boot unit failure on fedora32-ty-1

randy.macleod@...

akuster808@...

3.3 M4

3.4 M1

 

14028

Autobuilder buildtools run fails with "Qemu ended unexpectedly"

randy.macleod@...

unassigned@...

3.3 M4

3.4 M1

 

14041

qemuarm-alt  failed to load rpcbind

randy.macleod@...

kai.kang@...

3.3 M4

3.4 M1

 

14095

signing selftest failure in test_signing_sstate_archive  debina9-ty-2

randy.macleod@...

saul.wold@...

3.3 M4

3.4 M1

 

14096

perl install race (pod2text)

randy.macleod@...

unassigned@...

3.3 M4

3.4 M1

 

14090

devtool.DevtoolExtractTests.test_devtool_deploy_target selftest failure

randy.macleod@...

stacygaikovaia@...

3.3 M4

3.4 M1

 

14123

Intermittent FileNotFound error on autobuilder oe-selftest-debian

randy.macleod@...

richard.purdie@...

3.3 M4

3.4 M1

 

14128

qemuppc failed to shutdown

randy.macleod@...

unassigned@...

3.3 M4

3.4 M1

 

14158

tinfoil.TinfoilTests.test_wait_event times out

randy.macleod@...

yifan.yu@...

3.3 M4

3.4 M1

 

14163

libevent arm ptest intermittent failure

randy.macleod@...

yifan.yu@...

3.3 M4

3.4 M1

 

14170

glib-2.0 codegen ptest failure

randy.macleod@...

yifan.yu@...

3.3 M4

3.4 M1

 

14184

udev ram3 timeout and RCU preempt stall

randy.macleod@...

bruce.ashfield@...

3.3 M4

3.4 M1

 

14190

qa-extra2 failing on AB with dnf checksum failures

randy.macleod@...

ross@...

3.3 M4

3.4 M1

 

14200

autobuilder failure for edk2-firmware 201911

randy.macleod@...

jon.mason@...

3.3 M4

3.4 M1

 

14197

strace ptest intermittent failure in delay.test

randy.macleod@...

randy.macleod@...

3.3 M4

3.4 M1

 

14201

Bitbake server intermittent timeout

randy.macleod@...

unassigned@...

3.3 M4

3.4 M1

 

14213

gawk ptest intermittent failure

randy.macleod@...

yifan.yu@...

3.3 M4

3.4 M1

 

14214

rpm-native: do_configure failed

randy.macleod@...

hongxu.jia@...

3.3 M4

3.4 M1

 

14227

Intermittent oe-selftest fails with bash 5.1 do_compile

randy.macleod@...

richard.purdie@...

3.3 M4

3.4 M1

 

14230

qemuarm testimage shows serial login warning

randy.macleod@...

saul.wold@...

3.3 M4

3.4 M1

 

14244

util-linux script:_size ptest failure

randy.macleod@...

unassigned@...

3.3 M4

3.4 M1

 

14246

devtool test failures: github tls timeout

randy.macleod@...

unassigned@...

3.3 M4

3.4 M1

 

14250

core-image-sato.bb:do_testimage failure at systemd.SystemdBasicTests.test_systemd_failed

randy.macleod@...

kai.kang@...

3.3 M4

3.4 M1

 

14251

core-image-sato-1.0-r0:do_testimage FAILED when starting qemu

randy.macleod@...

unassigned@...

3.3 M4

3.4 M1

 

14257

gstreamer1.0 ptest intermittent failure

randy.macleod@...

unassigned@...

3.3 M4

3.4 M1

 

14258

perl ptest intermittent failure

randy.macleod@...

timothy.t.orling@...

3.3 M4

3.4 M1

 

14262

runcmd.RunCmdTests.test_stdin_timeout times out

randy.macleod@...

unassigned@...

3.3 M4

3.4 M1

 

14263

lttng-tools ptest intermittent failure

randy.macleod@...

unassigned@...

3.3 M4

3.4 M1

 

14273

qemu CPU starvation triggers rcu_preempt stall detection

randy.macleod@...

unassigned@...

3.3 M4

3.4 M1

 

14259

NFS mounting issue on  qemux64 oe-selftest glibc.GlibcSelfTestSystemEmulated.test_glibc

randy.macleod@...

unassigned@...

3.3 M4

3.4 M1

 

14272

qemumips64 testimage systemd didnt reach login prompt

randy.macleod@...

unassigned@...

3.3 M4

3.4 M1

 

14275

qemuarm64 parselogs fail due to udev taking to much time

randy.macleod@...

unassigned@...

3.3 M4

3.4 M1

 

14284

strace ptest intermittent failure in strace--relative-timestamps-us.gen.test

randy.macleod@...

randy.macleod@...

3.3 M4

3.4 M1

 

14289

failure in the command 'bitbake  glibc-testsuite -c check'

randy.macleod@...

unassigned@...

3.3 M4

3.4 M1

 

14290

golang TLS hanshake timeout

randy.macleod@...

raj.khem@...

3.3 M4

3.4 M1

 

14294

valgrind memcheck/tests/linux/timerfd-syscall ptest intermittent failure

randy.macleod@...

yifan.yu@...

3.3 M4

3.4 M1

 

14296

python3 ptest intermittent failure

randy.macleod@...

yifan.yu@...

3.3 M4

3.4 M1

 

14300

libtool-cross parallelism build failure

randy.macleod@...

unassigned@...

3.3 M4

3.4 M1

 

14299

failure in the command 'bitbake  gcc-runtime -c check'

randy.macleod@...

unassigned@...

3.3 M4

3.4 M1

 

14310

xz / liblzma memory allocation failure during reproducible build testing

randy.macleod@...

changqing.li@...

3.3 M4

3.4 M1

 

14311

valgrind drd/tests ptest intermittent failure

randy.macleod@...

yifan.yu@...

3.3 M4

3.4 M1

 

14328

Mitigate AB ptest intermittent failure

randy.macleod@...

richard.purdie@...

3.3 M4

3.4 M1

 

14331

Memory issues during oe-selftest

randy.macleod@...

trevor.gamblin@...

3.3 M4

3.4 M1

Thanks,

 

Stephen K. Jolley

Yocto Project Program Manager

(    Cell:                (208) 244-4460

* Email:              sjolley.yp.pm@...

 


Enhancements/Bugs closed WW15!

Stephen Jolley
 

All,

The below were the owners of enhancements or bugs closed during the last week!

Who

Count

randy.macleod@...

5

limon.anibal@...

2

mhalstead@...

1

steve@...

1

Grand Total

9

Thanks,

 

Stephen K. Jolley

Yocto Project Program Manager

(    Cell:                (208) 244-4460

* Email:              sjolley.yp.pm@...

 

4701 - 4720 of 57773