From 0b1e1d50070f9de390e7a6f109e86c3ba111847e Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Tue, 17 Dec 2024 12:12:26 +0100 Subject: [PATCH] base-passwd: Update the status for two patches The two patches to disable use of debconf and generation of documentation have been merged upstream. (From OE-Core rev: f68617115d3518368db16bc16bcf4578619999fe) Signed-off-by: Peter Kjellerstedt Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit aca8844d7c05b4ba937625e59275d3f7953d3da7) Signed-off-by: Jonas Gorski Signed-off-by: Steve Sakoman --- ...0006-Make-it-possible-to-build-without-debconf-support.patch | 2 +- ...7-Make-it-possible-to-disable-the-generation-of-the-do.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/base-passwd/base-passwd/0006-Make-it-possible-to-build-without-debconf-support.patch b/meta/recipes-core/base-passwd/base-passwd/0006-Make-it-possible-to-build-without-debconf-support.patch index 61ed1641a1..6e236993f5 100644 --- a/meta/recipes-core/base-passwd/base-passwd/0006-Make-it-possible-to-build-without-debconf-support.patch +++ b/meta/recipes-core/base-passwd/base-passwd/0006-Make-it-possible-to-build-without-debconf-support.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Make it possible to build without debconf support Not all systems have the debconfclient library available. -Upstream-Status: Submitted [https://salsa.debian.org/debian/base-passwd/-/merge_requests/11] +Upstream-Status: Backport [https://salsa.debian.org/debian/base-passwd/-/commit/c72aa5dd25a952da25e307761f4526db2c8c39ec] Signed-off-by: Peter Kjellerstedt --- Makefile.am | 1 - diff --git a/meta/recipes-core/base-passwd/base-passwd/0007-Make-it-possible-to-disable-the-generation-of-the-do.patch b/meta/recipes-core/base-passwd/base-passwd/0007-Make-it-possible-to-disable-the-generation-of-the-do.patch index 2bec065cdb..5c63599143 100644 --- a/meta/recipes-core/base-passwd/base-passwd/0007-Make-it-possible-to-disable-the-generation-of-the-do.patch +++ b/meta/recipes-core/base-passwd/base-passwd/0007-Make-it-possible-to-disable-the-generation-of-the-do.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Make it possible to disable the generation of the Not all systems have docbook and po4a available. -Upstream-Status: Submitted [https://salsa.debian.org/debian/base-passwd/-/merge_requests/11] +Upstream-Status: Backport [https://salsa.debian.org/debian/base-passwd/-/commit/2a6d16e595c93084e279d0dcbef37d960b44fd1a] Signed-off-by: Peter Kjellerstedt --- Makefile.am | 2 ++