From 2eae7e6f665ad5a0d734edda6ef5dff5a534eca6 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 1 Sep 2020 19:20:58 +0100 Subject: 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. Signed-off-by: Richard Purdie --- meta/recipes-core/images/build-appliance-image_15.0.0.bb | 2 +- meta/recipes-extended/packagegroups/packagegroup-core-base-utils.bb | 4 ++-- 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" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" IMAGE_INSTALL = "packagegroup-core-boot packagegroup-core-ssh-openssh packagegroup-self-hosted \ - kernel-dev kernel-devsrc connman connman-plugin-ethernet dhcp-client \ + kernel-dev kernel-devsrc connman connman-plugin-ethernet dhcpcd \ tzdata python3-pip perl-misc" IMAGE_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} = "\ coreutils \ cpio \ ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "", "debianutils-run-parts", d)} \ - dhcp-client \ - ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "", "dhcp-server", d)} \ + dhcpcd \ + ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "", "kea", d)} \ diffutils \ ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "", "dpkg-start-stop", d)} \ e2fsprogs \ -- cgit 1.2.3-korg