Skip to contentSkip to conversation

meta-oe: fix native inheritance order in recipes

PATCH In review Alexandre Belloni 2 participants 3 messages Jan 27, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 meta-oe: fix native inheritance order in recipes

Classes native/nativesdk must be inherited last to prevent unexpected behaviour.

---
 .../recipes-devtools/autoconf-2.13/autoconf-2.13-native_2.13.bb | 2 +-
 meta-oe/recipes-support/dfu-util/dfu-util-native_0.10.bb        | 2 +-
 .../xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.10.bb         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
meta-oe/recipes-devtools/autoconf-2.13/autoconf-2.13-native_2.13.bb +1 -1
index a54a7331df2d..604135839a7b 100644
@@ -19,7 +19,7 @@ S = "${WORKDIR}/${BPN}"
 SRC_URI[md5sum] = "9de56d4a161a723228220b0f425dc711"
 SRC_URI[sha256sum] = "f0611136bee505811e9ca11ca7ac188ef5323a8e2ef19cffd3edb3cf08fd791e"
 
-inherit native texinfo
+inherit texinfo native
 
 DEPENDS += "m4-native gnu-config-native"
 RDEPENDS_${PN} = "m4-native gnu-config-native"
meta-oe/recipes-support/dfu-util/dfu-util-native_0.10.bb +1 -1
index 4305e3b4086e..4641b0181aef 100644
@@ -1,6 +1,6 @@
 require dfu-util_${PV}.bb
 
-inherit native deploy
+inherit deploy native
 
 DEPENDS = "libusb1-native"
 
meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.10.bb +1 -1
index 170e0bf785e4..becf9914884e 100644
@@ -14,7 +14,7 @@ SRC_URI[sha256sum] = "977420c082450dc808de301ef56af4856d653eea71519a973c3490a780
 S = "${WORKDIR}/${XORG_PN}-${PV}"
 B = "${WORKDIR}/build"
 
-inherit native pkgconfig
+inherit pkgconfig native
 
 do_configure[noexec] = "1"
 
Signature · 1 line
2.29.2
#1 lore raw

Thanks.

Khem already sent these changes in 2 separate patches which are already in master-next:
https://git.openembedded.org/meta-openembedded/commit/?h=master-next&id=58a4c525ac1359f91ba8e97a26eb693e6468a362
https://git.openembedded.org/meta-openembedded/commit/?h=master-next&id=6d5f8cc9d444e220d212dd23a497c82a2dfce1e2

Quoted 65 lines · Alexandre Belloni

Classes native/nativesdk must be inherited last to prevent unexpected behaviour.

---
 .../recipes-devtools/autoconf-2.13/autoconf-2.13-native_2.13.bb | 2 +-
 meta-oe/recipes-support/dfu-util/dfu-util-native_0.10.bb        | 2 +-
 .../xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.10.bb         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
(quoted diff) +0 -0

autoconf-2.13-native_2.13.bb b/meta-oe/recipes-devtools/autoconf-2.13/ autoconf-2.13-native_2.13.bb
index a54a7331df2d..604135839a7b 100644

meta-oe/recipes-devtools/autoconf-2.13/autoconf-2.13-native_2.13.bb +0 -0
@@ -19,7 +19,7 @@ S = "${WORKDIR}/${BPN}"
 SRC_URI[md5sum] = "9de56d4a161a723228220b0f425dc711"
 SRC_URI[sha256sum] =

"f0611136bee505811e9ca11ca7ac188ef5323a8e2ef19cffd3edb3cf08fd791e"

meta-oe/recipes-devtools/autoconf-2.13/autoconf-2.13-native_2.13.bb +1 -1
-inherit native texinfo
+inherit texinfo native
 
 DEPENDS += "m4-native gnu-config-native"
 RDEPENDS_${PN} = "m4-native gnu-config-native"
meta-oe/recipes-support/dfu-util/dfu-util-native_0.10.bb +1 -1
index 4305e3b4086e..4641b0181aef 100644
@@ -1,6 +1,6 @@
 require dfu-util_${PV}.bb
 
-inherit native deploy
+inherit deploy native
 
 DEPENDS = "libusb1-native"
 
(quoted diff) +0 -0

xserver-xorg-cvt-native_1.20.10.bb
b/meta-oe/recipes-support/xserver-xorg-cvt/
xserver-xorg-cvt-native_1.20.10.bb
index 170e0bf785e4..becf9914884e 100644
--- a/meta-oe/recipes-support/xserver-xorg-cvt/
xserver-xorg-cvt-native_1.20.10.bb
+++ b/meta-oe/recipes-support/xserver-xorg-cvt/
xserver-xorg-cvt-native_1.20.10.bb

(quoted diff) +0 -0
@@ -14,7 +14,7 @@ SRC_URI[sha256sum] =

"977420c082450dc808de301ef56af4856d653eea71519a973c3490a780
S = "${WORKDIR}/${XORG_PN}-${PV}"
B = "${WORKDIR}/build"

meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.10.bb +1 -2
-inherit native pkgconfig
+inherit pkgconfig native
 
 do_configure[noexec] = "1"
 
--

2.29.2

#2 lore raw
Quoted 7 lines · Martin Jansa

Thanks.

Khem already sent these changes in 2 separate patches which are already in master-next:
https://git.openembedded.org/meta-openembedded/commit/?h=master-next&id=58a4c525ac1359f91ba8e97a26eb693e6468a362
https://git.openembedded.org/meta-openembedded/commit/?h=master-next&id=6d5f8cc9d444e220d212dd23a497c82a2dfce1e2

Right, I did prepare that one earlier today and just sent it now.

Quoted 68 lines
Quoted 65 lines · Alexandre Belloni

Classes native/nativesdk must be inherited last to prevent unexpected behaviour.

---
 .../recipes-devtools/autoconf-2.13/autoconf-2.13-native_2.13.bb | 2 +-
 meta-oe/recipes-support/dfu-util/dfu-util-native_0.10.bb        | 2 +-
 .../xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.10.bb         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
(quoted diff) +0 -0

autoconf-2.13-native_2.13.bb b/meta-oe/recipes-devtools/autoconf-2.13/ autoconf-2.13-native_2.13.bb
index a54a7331df2d..604135839a7b 100644

meta-oe/recipes-devtools/autoconf-2.13/autoconf-2.13-native_2.13.bb +0 -0
@@ -19,7 +19,7 @@ S = "${WORKDIR}/${BPN}"
 SRC_URI[md5sum] = "9de56d4a161a723228220b0f425dc711"
 SRC_URI[sha256sum] =

"f0611136bee505811e9ca11ca7ac188ef5323a8e2ef19cffd3edb3cf08fd791e"

meta-oe/recipes-devtools/autoconf-2.13/autoconf-2.13-native_2.13.bb +1 -1
-inherit native texinfo
+inherit texinfo native
 
 DEPENDS += "m4-native gnu-config-native"
 RDEPENDS_${PN} = "m4-native gnu-config-native"
meta-oe/recipes-support/dfu-util/dfu-util-native_0.10.bb +1 -1
index 4305e3b4086e..4641b0181aef 100644
@@ -1,6 +1,6 @@
 require dfu-util_${PV}.bb
 
-inherit native deploy
+inherit deploy native
 
 DEPENDS = "libusb1-native"
 
(quoted diff) +0 -0

xserver-xorg-cvt-native_1.20.10.bb
b/meta-oe/recipes-support/xserver-xorg-cvt/
xserver-xorg-cvt-native_1.20.10.bb
index 170e0bf785e4..becf9914884e 100644
--- a/meta-oe/recipes-support/xserver-xorg-cvt/
xserver-xorg-cvt-native_1.20.10.bb
+++ b/meta-oe/recipes-support/xserver-xorg-cvt/
xserver-xorg-cvt-native_1.20.10.bb

(quoted diff) +0 -0
@@ -14,7 +14,7 @@ SRC_URI[sha256sum] =

"977420c082450dc808de301ef56af4856d653eea71519a973c3490a780
S = "${WORKDIR}/${XORG_PN}-${PV}"
B = "${WORKDIR}/build"

meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.10.bb +1 -2
-inherit native pkgconfig
+inherit pkgconfig native
 
 do_configure[noexec] = "1"
 
--

2.29.2

Signature · 3 lines
Alexandre Belloni, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com