diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2025-06-04 08:00:56 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-06-05 11:02:22 +0100 |
commit | 6489e5cb801e11e7dd06baebae4ab158f10e18f5 (patch) | |
tree | 7fa4562f1b29289e0445f378f2fe7dcd0a8a5214 /meta | |
parent | 3d6ae7775ca2da9ad56f7792cf23977e9755eef6 (diff) | |
download | poky-6489e5cb801e11e7dd06baebae4ab158f10e18f5.tar.gz |
quilt: 0.68 -> 0.69
Add 0001-contrib-spec-filters-obs-usr-bin-sh-bin-sh.patch to fix:
ERROR: quilt-0.69-r0 do_package_qa: QA Issue: /usr/share/quilt/spec-filters/obs contained in package quilt requires /usr/bin/sh, but no providers found in RDEPENDS:quilt? [file-rdeps]
(From OE-Core rev: 05665175f7f9ed75be226034434753ee9e0af3be)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/quilt/quilt-native_0.69.bb (renamed from meta/recipes-devtools/quilt/quilt-native_0.68.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-devtools/quilt/quilt.inc | 3 | ||||
-rw-r--r-- | meta/recipes-devtools/quilt/quilt/0001-contrib-spec-filters-obs-usr-bin-sh-bin-sh.patch | 28 | ||||
-rw-r--r-- | meta/recipes-devtools/quilt/quilt_0.69.bb (renamed from meta/recipes-devtools/quilt/quilt_0.68.bb) | 0 |
4 files changed, 30 insertions, 1 deletions
diff --git a/meta/recipes-devtools/quilt/quilt-native_0.68.bb b/meta/recipes-devtools/quilt/quilt-native_0.69.bb index 22374425fa..22374425fa 100644 --- a/meta/recipes-devtools/quilt/quilt-native_0.68.bb +++ b/meta/recipes-devtools/quilt/quilt-native_0.69.bb | |||
diff --git a/meta/recipes-devtools/quilt/quilt.inc b/meta/recipes-devtools/quilt/quilt.inc index 4bae5c6c19..59d13237e2 100644 --- a/meta/recipes-devtools/quilt/quilt.inc +++ b/meta/recipes-devtools/quilt/quilt.inc | |||
@@ -11,11 +11,12 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/quilt/quilt-${PV}.tar.gz \ | |||
11 | file://run-ptest \ | 11 | file://run-ptest \ |
12 | file://test.sh \ | 12 | file://test.sh \ |
13 | file://0001-tests-Allow-different-output-from-mv.patch \ | 13 | file://0001-tests-Allow-different-output-from-mv.patch \ |
14 | file://0001-contrib-spec-filters-obs-usr-bin-sh-bin-sh.patch \ | ||
14 | " | 15 | " |
15 | 16 | ||
16 | SRC_URI:append:class-target = " file://gnu_patch_test_fix_target.patch" | 17 | SRC_URI:append:class-target = " file://gnu_patch_test_fix_target.patch" |
17 | 18 | ||
18 | SRC_URI[sha256sum] = "fe8c09de03c106e85b3737c8f03ade147c956b79ed7af485a1c8a3858db38426" | 19 | SRC_URI[sha256sum] = "555ddffde22da3c86d1caf5a9c1fb8a152ac2b84730437bd39cc08849c9f4852" |
19 | 20 | ||
20 | inherit autotools-brokensep ptest | 21 | inherit autotools-brokensep ptest |
21 | 22 | ||
diff --git a/meta/recipes-devtools/quilt/quilt/0001-contrib-spec-filters-obs-usr-bin-sh-bin-sh.patch b/meta/recipes-devtools/quilt/quilt/0001-contrib-spec-filters-obs-usr-bin-sh-bin-sh.patch new file mode 100644 index 0000000000..219deab0d6 --- /dev/null +++ b/meta/recipes-devtools/quilt/quilt/0001-contrib-spec-filters-obs-usr-bin-sh-bin-sh.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | From 0e00d22182c4cce3b242dd8f4166d3df238b3a0b Mon Sep 17 00:00:00 2001 | ||
2 | From: Robert Yang <liezhi.yang@windriver.com> | ||
3 | Date: Wed, 4 Jun 2025 00:21:40 -0700 | ||
4 | Subject: [PATCH] contrib/spec-filters/obs: /usr/bin/sh -> /bin/sh | ||
5 | |||
6 | The /bin/sh is more common than /usr/bin/sh, the later one doesn't exist on | ||
7 | distributions such as Ubuntu 22.04. | ||
8 | |||
9 | Upstream-Status: Submitted [https://lists.nongnu.org/archive/html/quilt-dev/2025-06/msg00002.html] | ||
10 | |||
11 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
12 | --- | ||
13 | contrib/spec-filters/obs | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/contrib/spec-filters/obs b/contrib/spec-filters/obs | ||
17 | index 2f5b169..b675230 100755 | ||
18 | --- a/contrib/spec-filters/obs | ||
19 | +++ b/contrib/spec-filters/obs | ||
20 | @@ -1,4 +1,4 @@ | ||
21 | -#!/usr/bin/sh | ||
22 | +#!/bin/sh | ||
23 | # Basic spec file filter for OBS packages | ||
24 | # https://build.opensuse.org/ | ||
25 | |||
26 | -- | ||
27 | 2.49.0 | ||
28 | |||
diff --git a/meta/recipes-devtools/quilt/quilt_0.68.bb b/meta/recipes-devtools/quilt/quilt_0.69.bb index bf9e3c720f..bf9e3c720f 100644 --- a/meta/recipes-devtools/quilt/quilt_0.68.bb +++ b/meta/recipes-devtools/quilt/quilt_0.69.bb | |||