From: Robert Yang Date: Wed, 4 Jun 2025 15:00:56 +0000 (-0700) Subject: quilt: 0.68 -> 0.69 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=05665175f7f9ed75be226034434753ee9e0af3be;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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] Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-devtools/quilt/quilt-native_0.68.bb b/meta/recipes-devtools/quilt/quilt-native_0.69.bb similarity index 100% rename from meta/recipes-devtools/quilt/quilt-native_0.68.bb rename to 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 4bae5c6c197..59d13237e2f 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 \ file://run-ptest \ file://test.sh \ file://0001-tests-Allow-different-output-from-mv.patch \ + file://0001-contrib-spec-filters-obs-usr-bin-sh-bin-sh.patch \ " SRC_URI:append:class-target = " file://gnu_patch_test_fix_target.patch" -SRC_URI[sha256sum] = "fe8c09de03c106e85b3737c8f03ade147c956b79ed7af485a1c8a3858db38426" +SRC_URI[sha256sum] = "555ddffde22da3c86d1caf5a9c1fb8a152ac2b84730437bd39cc08849c9f4852" inherit autotools-brokensep ptest 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 00000000000..219deab0d68 --- /dev/null +++ b/meta/recipes-devtools/quilt/quilt/0001-contrib-spec-filters-obs-usr-bin-sh-bin-sh.patch @@ -0,0 +1,28 @@ +From 0e00d22182c4cce3b242dd8f4166d3df238b3a0b Mon Sep 17 00:00:00 2001 +From: Robert Yang +Date: Wed, 4 Jun 2025 00:21:40 -0700 +Subject: [PATCH] contrib/spec-filters/obs: /usr/bin/sh -> /bin/sh + +The /bin/sh is more common than /usr/bin/sh, the later one doesn't exist on +distributions such as Ubuntu 22.04. + +Upstream-Status: Submitted [https://lists.nongnu.org/archive/html/quilt-dev/2025-06/msg00002.html] + +Signed-off-by: Robert Yang +--- + contrib/spec-filters/obs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/contrib/spec-filters/obs b/contrib/spec-filters/obs +index 2f5b169..b675230 100755 +--- a/contrib/spec-filters/obs ++++ b/contrib/spec-filters/obs +@@ -1,4 +1,4 @@ +-#!/usr/bin/sh ++#!/bin/sh + # Basic spec file filter for OBS packages + # https://build.opensuse.org/ + +-- +2.49.0 + diff --git a/meta/recipes-devtools/quilt/quilt_0.68.bb b/meta/recipes-devtools/quilt/quilt_0.69.bb similarity index 100% rename from meta/recipes-devtools/quilt/quilt_0.68.bb rename to meta/recipes-devtools/quilt/quilt_0.69.bb