diff options
author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2022-05-18 05:13:21 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-05-20 22:52:22 +0100 |
commit | ff5bead3bc13a9bf534f722ff24d6d93696a2284 (patch) | |
tree | 570ee3a178161bba0ba0f5c149f0e30e2ee701fb /meta/recipes-core | |
parent | 7a7de167c231980876a03e0e6cb3587bbc105d5c (diff) | |
download | poky-ff5bead3bc13a9bf534f722ff24d6d93696a2284.tar.gz |
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: aca8844d7c05b4ba937625e59275d3f7953d3da7)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
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 | |||
5 | 5 | ||
6 | Not all systems have the debconfclient library available. | 6 | Not all systems have the debconfclient library available. |
7 | 7 | ||
8 | Upstream-Status: Submitted [https://salsa.debian.org/debian/base-passwd/-/merge_requests/11] | 8 | Upstream-Status: Backport [https://salsa.debian.org/debian/base-passwd/-/commit/c72aa5dd25a952da25e307761f4526db2c8c39ec] |
9 | Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 9 | Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> |
10 | --- | 10 | --- |
11 | Makefile.am | 1 - | 11 | 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 | |||
6 | 6 | ||
7 | Not all systems have docbook and po4a available. | 7 | Not all systems have docbook and po4a available. |
8 | 8 | ||
9 | Upstream-Status: Submitted [https://salsa.debian.org/debian/base-passwd/-/merge_requests/11] | 9 | Upstream-Status: Backport [https://salsa.debian.org/debian/base-passwd/-/commit/2a6d16e595c93084e279d0dcbef37d960b44fd1a] |
10 | Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 10 | Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> |
11 | --- | 11 | --- |
12 | Makefile.am | 2 ++ | 12 | Makefile.am | 2 ++ |