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>
This commit is contained in:
Robert Yang 2025-06-04 08:00:56 -07:00 committed by Richard Purdie
parent 3d6ae7775c
commit 6489e5cb80
4 changed files with 30 additions and 1 deletions

View File

@ -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

View File

@ -0,0 +1,28 @@
From 0e00d22182c4cce3b242dd8f4166d3df238b3a0b Mon Sep 17 00:00:00 2001
From: Robert Yang <liezhi.yang@windriver.com>
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 <liezhi.yang@windriver.com>
---
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