summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-09-01 19:20:58 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-09-02 16:00:46 +0100
commit6d60518854c5aab7f58bd9f010d8868d5820bb25 (patch)
tree9e107df210a8e8bbbf895bd88170169d7c100fcc /meta
parentd0ee1e19ca7cb5d902fc9002410383a11099ba66 (diff)
downloadpoky-6d60518854c5aab7f58bd9f010d8868d5820bb25.tar.gz
build-appliance/packagegroup-core-base-utils: Replace dhcp-client/dhcp-server with dhcpcd/kea
dhcp-client/dhcp-server is obsolete and unmaintained and about to be removed, replace it with something which is maintained. (From OE-Core rev: 2eae7e6f665ad5a0d734edda6ef5dff5a534eca6) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/images/build-appliance-image_15.0.0.bb2
-rw-r--r--meta/recipes-extended/packagegroups/packagegroup-core-base-utils.bb4
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-core/images/build-appliance-image_15.0.0.bb b/meta/recipes-core/images/build-appliance-image_15.0.0.bb
index c9367dd0c4..e6258a2d4b 100644
--- a/meta/recipes-core/images/build-appliance-image_15.0.0.bb
+++ b/meta/recipes-core/images/build-appliance-image_15.0.0.bb
@@ -6,7 +6,7 @@ LICENSE = "MIT"
6LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 6LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
7 7
8IMAGE_INSTALL = "packagegroup-core-boot packagegroup-core-ssh-openssh packagegroup-self-hosted \ 8IMAGE_INSTALL = "packagegroup-core-boot packagegroup-core-ssh-openssh packagegroup-self-hosted \
9 kernel-dev kernel-devsrc connman connman-plugin-ethernet dhcp-client \ 9 kernel-dev kernel-devsrc connman connman-plugin-ethernet dhcpcd \
10 tzdata python3-pip perl-misc" 10 tzdata python3-pip perl-misc"
11 11
12IMAGE_FEATURES += "x11-base package-management splash" 12IMAGE_FEATURES += "x11-base package-management splash"
diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-base-utils.bb b/meta/recipes-extended/packagegroups/packagegroup-core-base-utils.bb
index 7501837937..1e63da7f16 100644
--- a/meta/recipes-extended/packagegroups/packagegroup-core-base-utils.bb
+++ b/meta/recipes-extended/packagegroups/packagegroup-core-base-utils.bb
@@ -21,8 +21,8 @@ RDEPENDS_${PN} = "\
21 coreutils \ 21 coreutils \
22 cpio \ 22 cpio \
23 ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "", "debianutils-run-parts", d)} \ 23 ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "", "debianutils-run-parts", d)} \
24 dhcp-client \ 24 dhcpcd \
25 ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "", "dhcp-server", d)} \ 25 ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "", "kea", d)} \
26 diffutils \ 26 diffutils \
27 ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "", "dpkg-start-stop", d)} \ 27 ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "", "dpkg-start-stop", d)} \
28 e2fsprogs \ 28 e2fsprogs \