From b63c87cb318171cd67ced79583e12f778351dd71 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 21 Jan 2013 15:46:46 -0800 Subject: [PATCH] angstrom/conf: Add systemd to DISTRO_FEATURES OE-Core wants systemd to be in distro features to leverage the systemd infra from Core secondly in OE-Core there is not build time dep on update alternatives see 56a59ef12936dcc6464cf1d43dda6957a5aa8c65 update-alternatives now needs to ask for opkg we were wrongly asking for update-alternatives-cworth which is a runtime package. Signed-off-by: Khem Raj --- conf/distro/include/angstrom-package-ipk.inc | 2 +- conf/distro/include/angstrom.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/distro/include/angstrom-package-ipk.inc b/conf/distro/include/angstrom-package-ipk.inc index 6a04871..b37717e 100644 --- a/conf/distro/include/angstrom-package-ipk.inc +++ b/conf/distro/include/angstrom-package-ipk.inc @@ -4,7 +4,7 @@ ANGSTROM_FEED_CONFIGS ?= "angstrom-feed-configs" EXTRAOPKGCONFIG = "opkg-config-base ${ANGSTROM_FEED_CONFIGS}" -ANGSTROM_IPK_UPDATE_ALTERNATIVES ?= "update-alternatives-cworth" +ANGSTROM_IPK_UPDATE_ALTERNATIVES ?= "opkg" DISTRO_UPDATE_ALTERNATIVES = "${ANGSTROM_IPK_UPDATE_ALTERNATIVES}" diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index bd40f27..984030e 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -154,7 +154,7 @@ DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}" DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}" # We want images supporting the following features (for packagegroup(-core)-base) -DISTRO_FEATURES = "alsa argp bluetooth ext2 ipv4 ipv6 irda largefile nfs pam pci pcmcia ppp smbfs usbgadget usbhost vfat wifi xattr zeroconf" +DISTRO_FEATURES = "alsa argp bluetooth ext2 ipv4 ipv6 irda largefile nfs pam pci pcmcia ppp smbfs systemd usbgadget usbhost vfat wifi xattr zeroconf" # USE-flag like features DISTRO_FEATURES += "tk"