Martin Jansa aa851eb8e1 meta-oe/dynamic-layers: add one more missing Upstream-Status and fix one malformed
* even openembedded-core/scripts/yocto-check-layer didn't spot missing Upstream-Status in:
  /OE/layers/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu/7_6.diff

  nor

  Malformed Upstream-Status 'Malformed Upstream-Status in patch
  /OE/layers/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/0001-Unbolt-ubuntu-hack.patch
  Please correct according to https://docs.yoctoproject.org/contributor-guide/recipe-style-guide.html#patch-upstream-status :
  Upstream-Status: Inappropriates [ Cross-compile specific ]' (/OE/layers/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/0001-Unbolt-ubuntu-hack.patch)
  Unknown Upstream-Status value 'inappropriates' (/OE/layers/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc/0001-Unbolt-ubuntu-hack.patch)

  those were caught by patchreview.py again, but executed on dynamic-layers/* as:
  openembedded-core# for l in /OE/layers/meta-openembedded/meta-oe/dynamic-layers/*; do ./scripts/contrib/patchreview.py -v $l > $l.qa-patches; done

Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
2023-09-29 09:50:43 -07:00

27 lines
924 B
Diff

From ca126a2832aaff0deef3ba7eaf411dd0dc43b068 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 16 Mar 2023 11:31:14 -0700
Subject: [PATCH] Unbolt ubuntu hack
This bites during cross compiling where the target is different than
build host and build host might be ubuntu but that does not matter in
cross compilation case. This fails builds when usrmerge feature is used
Upstream-Status: Inappropriate [ Cross-compile specific ]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/configure.ac
+++ b/configure.ac
@@ -429,7 +429,7 @@ AC_CHECK_LIB([udev], [udev_device_new_fr
])
dnl Ubuntu's systemd pkg-config seems broken beyond repair. So:
-kernelversion=`cat /proc/version || echo "non-linux"`
+kernelversion="cross-compiled"
AS_CASE([$kernelversion],
[*Ubuntu*],[
AC_MSG_NOTICE([Hardwiring Ubuntu systemd setup])