[PATCH 1/3] change compat to dunfell and newer

[Michael Haener]

From: Adrian Freihofer <adrian.f...@siemens.com>

Signed-off-by: Adrian Freihofer <adrian.f...@siemens.com>
---
conf/layer.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/layer.conf b/conf/layer.conf
index 33aae5f..77a5d07 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -17,4 +17,4 @@ BBFILE_COLLECTIONS += "efibootguard"
BBFILE_PATTERN_efibootguard = "^${LAYERDIR}/"
BBFILE_PRIORITY_efibootguard = "6"

-LAYERSERIES_COMPAT_efibootguard = "rocko sumo thud warrior zeus dunfell"
+LAYERSERIES_COMPAT_efibootguard = "dunfell hardknott honister"
--
2.34.1

[Michael Haener]

Signed-off-by: Michael Haener <michael...@siemens.com>
---
recipes-bsp/efibootguard/efibootguard_0.8.bb | 20 ++++++++++----------
recipes-core/busybox/busybox_%.bbappend | 4 ++--
2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/recipes-bsp/efibootguard/efibootguard_0.8.bb b/recipes-bsp/efibootguard/efibootguard_0.8.bb
index e7717cd..e38db70 100644
--- a/recipes-bsp/efibootguard/efibootguard_0.8.bb
+++ b/recipes-bsp/efibootguard/efibootguard_0.8.bb
@@ -17,7 +17,7 @@ SRCREV = "ac1685aea75fb3e3d16c0c0e4f8261a2edb63536"

S = "${WORKDIR}/git"

-DEPENDS = "gnu-efi pciutils zlib libcheck"
+DEPENDS:class-target = "gnu-efi pciutils zlib libcheck"

inherit autotools deploy pkgconfig

@@ -33,11 +33,11 @@ EXTRA_OECONF = "--with-gnuefi-sys-dir=${STAGING_DIR_HOST} \
--with-gnuefi-include-dir=${STAGING_INCDIR}/efi \
--with-gnuefi-lib-dir=${STAGING_LIBDIR}"

-FILES_${PN}-tools = "${bindir}"
-FILES_${PN}-tools-dbg = "/usr/src/debug ${bindir}/.debug /usr/lib/debug"
-FILES_${PN}-tools-staticdev = "${libdir}/lib*.a"
-FILES_${PN}-tools-dev = "${includedir}/${BPN}"
-FILES_${PN} = "${libdir}/${BPN}"
+FILES:${PN}-tools = "${bindir}"
+FILES:${PN}-tools-dbg = "/usr/src/debug ${bindir}/.debug /usr/lib/debug"
+FILES:${PN}-tools-staticdev = "${libdir}/lib*.a"
+FILES:${PN}-tools-dev = "${includedir}/${BPN}"
+FILES:${PN} = "${libdir}/${BPN}"

do_deploy () {
install ${B}/efibootguard*.efi ${DEPLOYDIR}
@@ -45,17 +45,17 @@ do_deploy () {
addtask deploy before do_build after do_compile

BBCLASSEXTEND = "native"
-DEPENDS_class-native = "zlib libcheck"
+DEPENDS:class-native = "zlib libcheck"

-do_compile_class-native () {
+do_compile:class-native () {
oe_runmake bg_setenv
}

-do_install_class-native () {
+do_install:class-native () {
install -d ${D}${bindir}/
install -m755 ${B}/bg_setenv ${D}${bindir}/
ln -s bg_setenv ${D}${bindir}/bg_printenv
}

-do_deploy_class-native () {
+do_deploy:class-native () {
}
diff --git a/recipes-core/busybox/busybox_%.bbappend b/recipes-core/busybox/busybox_%.bbappend
index 8fdb540..41c349d 100644
--- a/recipes-core/busybox/busybox_%.bbappend
+++ b/recipes-core/busybox/busybox_%.bbappend
@@ -9,12 +9,12 @@
# This work is licensed under the terms of the GNU GPL, version 2.
# See the COPYING.GPLv2 file in the top-level directory.

-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"

SRC_URI += "file://watchdog.cfg \
file://watchdog.sh"

-do_install_append() {
+do_install:append() {
install -d "${D}${sysconfdir}/init.d"
install -m 0755 "${WORKDIR}/watchdog.sh" "${D}${sysconfdir}/init.d/watchdog.sh"
install -d "${D}${sysconfdir}/rcS.d"
--
2.34.1

[Michael Haener]

Signed-off-by: Michael Haener <michael...@siemens.com>
---

...ibootguard_0.8.bb => efibootguard_0.10.bb} | 23 +++++++++++++++----
1 file changed, 18 insertions(+), 5 deletions(-)
rename recipes-bsp/efibootguard/{efibootguard_0.8.bb => efibootguard_0.10.bb} (68%)

diff --git a/recipes-bsp/efibootguard/efibootguard_0.8.bb b/recipes-bsp/efibootguard/efibootguard_0.10.bb
similarity index 68%
rename from recipes-bsp/efibootguard/efibootguard_0.8.bb
rename to recipes-bsp/efibootguard/efibootguard_0.10.bb
index e38db70..79eb601 100644
--- a/recipes-bsp/efibootguard/efibootguard_0.8.bb
+++ b/recipes-bsp/efibootguard/efibootguard_0.10.bb
@@ -13,7 +13,8 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"

SRC_URI = "git://github.com/siemens/efibootguard.git;protocol=https;branch=master"
-SRCREV = "ac1685aea75fb3e3d16c0c0e4f8261a2edb63536"
+SRCREV = "99435e3d7ac960883c951db151ff3ac3c4088458"
+SRC_URI[sha256sum] = "1f63dae861762700d735b10815dea91f563899367357895026e26a211e4d227b"

S = "${WORKDIR}/git"

@@ -36,16 +37,26 @@ EXTRA_OECONF = "--with-gnuefi-sys-dir=${STAGING_DIR_HOST} \

FILES:${PN}-tools = "${bindir}"

FILES:${PN}-tools-dbg = "/usr/src/debug ${bindir}/.debug /usr/lib/debug"

FILES:${PN}-tools-staticdev = "${libdir}/lib*.a"

-FILES:${PN}-tools-dev = "${includedir}/${BPN}"
-FILES:${PN} = "${libdir}/${BPN}"
+FILES:${PN}-tools-dev = " \
+ ${includedir}/${BPN} \
+ ${libdir}/libebgenv.so \
+"
+FILES:${PN} = " \
+ ${libdir}/${BPN} \
+ ${target_datadir}/${BPN}/completion/* \
+ ${libdir}/libebgenv-${PV}*.so \
+"

do_deploy () {
install ${B}/efibootguard*.efi ${DEPLOYDIR}
}

addtask deploy before do_build after do_compile

-BBCLASSEXTEND = "native"
-DEPENDS:class-native = "zlib libcheck"
+DEPENDS:class-native = "zlib-native libcheck-native"
+EXTRA_OECONF:class-native = "--with-gnuefi-sys-dir=${STAGING_DIR_HOST} \
+ --with-gnuefi-include-dir=${STAGING_INCDIR}/efi \
+ --with-gnuefi-lib-dir=${STAGING_LIBDIR} \
+ --disable-bootloader"

do_compile:class-native () {
oe_runmake bg_setenv
@@ -59,3 +70,5 @@ do_install:class-native () {

do_deploy:class-native () {
}
+
+BBCLASSEXTEND = "native"
--
2.34.1

[Jan Kiszka]

On 27.02.22 23:57, Michael Haener wrote:
> Signed-off-by: Michael Haener <michael...@siemens.com>
> ---
> ...ibootguard_0.8.bb => efibootguard_0.10.bb} | 23 +++++++++++++++----
> 1 file changed, 18 insertions(+), 5 deletions(-)
> rename recipes-bsp/efibootguard/{efibootguard_0.8.bb => efibootguard_0.10.bb} (68%)
>
> diff --git a/recipes-bsp/efibootguard/efibootguard_0.8.bb b/recipes-bsp/efibootguard/efibootguard_0.10.bb
> similarity index 68%
> rename from recipes-bsp/efibootguard/efibootguard_0.8.bb
> rename to recipes-bsp/efibootguard/efibootguard_0.10.bb
> index e38db70..79eb601 100644
> --- a/recipes-bsp/efibootguard/efibootguard_0.8.bb
> +++ b/recipes-bsp/efibootguard/efibootguard_0.10.bb
> @@ -13,7 +13,8 @@ LICENSE = "GPLv2"
> LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
>
> SRC_URI = "git://github.com/siemens/efibootguard.git;protocol=https;branch=master"
> -SRCREV = "ac1685aea75fb3e3d16c0c0e4f8261a2edb63536"
> +SRCREV = "99435e3d7ac960883c951db151ff3ac3c4088458"
> +SRC_URI[sha256sum] = "1f63dae861762700d735b10815dea91f563899367357895026e26a211e4d227b"

Extra SHA for a git repo? New bitbake feature that I missed?

>
> S = "${WORKDIR}/git"
>
> @@ -36,16 +37,26 @@ EXTRA_OECONF = "--with-gnuefi-sys-dir=${STAGING_DIR_HOST} \
> FILES:${PN}-tools = "${bindir}"
> FILES:${PN}-tools-dbg = "/usr/src/debug ${bindir}/.debug /usr/lib/debug"
> FILES:${PN}-tools-staticdev = "${libdir}/lib*.a"
> -FILES:${PN}-tools-dev = "${includedir}/${BPN}"
> -FILES:${PN} = "${libdir}/${BPN}"
> +FILES:${PN}-tools-dev = " \
> + ${includedir}/${BPN} \
> + ${libdir}/libebgenv.so \
> +"
> +FILES:${PN} = " \
> + ${libdir}/${BPN} \
> + ${target_datadir}/${BPN}/completion/* \

Shouldn't the completion better go into the tools package?

> + ${libdir}/libebgenv-${PV}*.so \
> +"
>
> do_deploy () {
> install ${B}/efibootguard*.efi ${DEPLOYDIR}
> }
> addtask deploy before do_build after do_compile
>
> -BBCLASSEXTEND = "native"
> -DEPENDS:class-native = "zlib libcheck"
> +DEPENDS:class-native = "zlib-native libcheck-native"
> +EXTRA_OECONF:class-native = "--with-gnuefi-sys-dir=${STAGING_DIR_HOST} \
> + --with-gnuefi-include-dir=${STAGING_INCDIR}/efi \
> + --with-gnuefi-lib-dir=${STAGING_LIBDIR} \
> + --disable-bootloader"
>
> do_compile:class-native () {
> oe_runmake bg_setenv
> @@ -59,3 +70,5 @@ do_install:class-native () {
>
> do_deploy:class-native () {
> }
> +
> +BBCLASSEXTEND = "native"

Rest of the series looks good to me.

Jan

--
Siemens AG, Technology
Competence Center Embedded Linux

[Haener, Michael]

copy paste mess from me. I will remove this.

>
> >  
> >  S = "${WORKDIR}/git"
> >  
> > @@ -36,16 +37,26 @@ EXTRA_OECONF = "--with-gnuefi-sys-
> > dir=${STAGING_DIR_HOST} \
> >  FILES:${PN}-tools = "${bindir}"
> >  FILES:${PN}-tools-dbg = "/usr/src/debug ${bindir}/.debug
> > /usr/lib/debug"
> >  FILES:${PN}-tools-staticdev = "${libdir}/lib*.a"
> > -FILES:${PN}-tools-dev = "${includedir}/${BPN}"
> > -FILES:${PN} = "${libdir}/${BPN}"
> > +FILES:${PN}-tools-dev = " \
> > +    ${includedir}/${BPN} \
> > +    ${libdir}/libebgenv.so \
> > +"
> > +FILES:${PN} = " \
> > +    ${libdir}/${BPN} \
> > +    ${target_datadir}/${BPN}/completion/* \
>
> Shouldn't the completion better go into the tools package?

Agree

[Michael Haener]

[Michael Haener]

Signed-off-by: Michael Haener <michael...@siemens.com>
---

...ibootguard_0.8.bb => efibootguard_0.10.bb} | 26 ++++++++++++++-----
1 file changed, 20 insertions(+), 6 deletions(-)
rename recipes-bsp/efibootguard/{efibootguard_0.8.bb => efibootguard_0.10.bb} (69%)

diff --git a/recipes-bsp/efibootguard/efibootguard_0.8.bb b/recipes-bsp/efibootguard/efibootguard_0.10.bb
similarity index 69%

rename from recipes-bsp/efibootguard/efibootguard_0.8.bb
rename to recipes-bsp/efibootguard/efibootguard_0.10.bb

index e38db70..8a50b77 100644
--- a/recipes-bsp/efibootguard/efibootguard_0.8.bb
+++ b/recipes-bsp/efibootguard/efibootguard_0.10.bb
@@ -13,7 +13,7 @@ LICENSE = "GPLv2"

LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"

SRC_URI = "git://github.com/siemens/efibootguard.git;protocol=https;branch=master"
-SRCREV = "ac1685aea75fb3e3d16c0c0e4f8261a2edb63536"
+SRCREV = "99435e3d7ac960883c951db151ff3ac3c4088458"

S = "${WORKDIR}/git"

@@ -33,19 +33,31 @@ EXTRA_OECONF = "--with-gnuefi-sys-dir=${STAGING_DIR_HOST} \

--with-gnuefi-include-dir=${STAGING_INCDIR}/efi \
--with-gnuefi-lib-dir=${STAGING_LIBDIR}"

-FILES:${PN}-tools = "${bindir}"
+FILES:${PN}-tools = " \
+ ${bindir} \

+ ${target_datadir}/${BPN}/completion/* \

+"

FILES:${PN}-tools-dbg = "/usr/src/debug ${bindir}/.debug /usr/lib/debug"
FILES:${PN}-tools-staticdev = "${libdir}/lib*.a"
-FILES:${PN}-tools-dev = "${includedir}/${BPN}"
-FILES:${PN} = "${libdir}/${BPN}"
+FILES:${PN}-tools-dev = " \
+ ${includedir}/${BPN} \
+ ${libdir}/libebgenv.so \
+"
+FILES:${PN} = " \
+ ${libdir}/${BPN} \

+ ${libdir}/libebgenv-${PV}*.so \

+"

do_deploy () {
install ${B}/efibootguard*.efi ${DEPLOYDIR}
}
addtask deploy before do_build after do_compile

-BBCLASSEXTEND = "native"
-DEPENDS:class-native = "zlib libcheck"
+DEPENDS:class-native = "zlib-native libcheck-native"

+EXTRA_OECONF:class-native = "--with-gnuefi-sys-dir=${STAGING_DIR_HOST} \
+ --with-gnuefi-include-dir=${STAGING_INCDIR}/efi \

+ --with-gnuefi-lib-dir=${STAGING_LIBDIR} \

+ --disable-bootloader"

do_compile:class-native () {
oe_runmake bg_setenv

@@ -59,3 +71,5 @@ do_install:class-native () {

do_deploy:class-native () {
}
+
+BBCLASSEXTEND = "native"

--
2.34.1

[Michael Haener]

Signed-off-by: Michael Haener <michael...@siemens.com>
---

recipes-bsp/efibootguard/efibootguard_0.8.bb | 20 ++++++++++----------
recipes-core/busybox/busybox_%.bbappend | 4 ++--
2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/recipes-bsp/efibootguard/efibootguard_0.8.bb b/recipes-bsp/efibootguard/efibootguard_0.8.bb
index e7717cd..e38db70 100644
--- a/recipes-bsp/efibootguard/efibootguard_0.8.bb
+++ b/recipes-bsp/efibootguard/efibootguard_0.8.bb
@@ -17,7 +17,7 @@ SRCREV = "ac1685aea75fb3e3d16c0c0e4f8261a2edb63536"

S = "${WORKDIR}/git"

-DEPENDS = "gnu-efi pciutils zlib libcheck"
+DEPENDS:class-target = "gnu-efi pciutils zlib libcheck"

inherit autotools deploy pkgconfig

@@ -33,11 +33,11 @@ EXTRA_OECONF = "--with-gnuefi-sys-dir=${STAGING_DIR_HOST} \

--with-gnuefi-include-dir=${STAGING_INCDIR}/efi \
--with-gnuefi-lib-dir=${STAGING_LIBDIR}"

-FILES_${PN}-tools = "${bindir}"
-FILES_${PN}-tools-dbg = "/usr/src/debug ${bindir}/.debug /usr/lib/debug"
-FILES_${PN}-tools-staticdev = "${libdir}/lib*.a"
-FILES_${PN}-tools-dev = "${includedir}/${BPN}"
-FILES_${PN} = "${libdir}/${BPN}"
+FILES:${PN}-tools = "${bindir}"
+FILES:${PN}-tools-dbg = "/usr/src/debug ${bindir}/.debug /usr/lib/debug"
+FILES:${PN}-tools-staticdev = "${libdir}/lib*.a"
+FILES:${PN}-tools-dev = "${includedir}/${BPN}"
+FILES:${PN} = "${libdir}/${BPN}"

do_deploy () {
install ${B}/efibootguard*.efi ${DEPLOYDIR}

@@ -45,17 +45,17 @@ do_deploy () {

addtask deploy before do_build after do_compile

[Jan Kiszka]

Series looks good to me now.

Reviewed-by: Jan Kiszka <jan.k...@siemens.com>