From 7d6defad17b20806c2591cdedd2969db6ee8bbd4 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 15 Mar 2011 11:29:56 +0100 Subject: [PATCH] angstrom v2010.x: prefer util-linux now that util-linux-ng has been merged back Signed-off-by: Koen Kooi Acked-by: Graeme Gregory --- conf/distro/angstrom-2010.x.conf | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/conf/distro/angstrom-2010.x.conf b/conf/distro/angstrom-2010.x.conf index 58fcae1..2112b16 100644 --- a/conf/distro/angstrom-2010.x.conf +++ b/conf/distro/angstrom-2010.x.conf @@ -128,8 +128,6 @@ ANGSTROM_BLACKLIST_pn-gconf-dbus-native = "gconf-dbus has been merged back into ANGSTROM_BLACKLIST_pn-ipkg = "ipkg has been superseded by opkg" -ANGSTROM_BLACKLIST_pn-util-linux = "only util-linux-ng is supported" - require conf/distro/include/angstrom.inc # Toolchain virtuals: @@ -166,12 +164,12 @@ DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "strace procps" # This hooks into task-base, so it won't do anything if your images doesn't include task-base. # angstrom-version: ship this to have an identifiable rootfs so user can report bugs against a specific version # ANGSTROM_FEED_CONFIGS: configfiles for the online feeds -# util-linux-ng-mount util-linux-ng-umount: busybox mount is broken +# util-linux-mount util-linux-umount: busybox mount is broken # angstrom-libc-fixup-hack: fixes an obscure bug with libc.so symlink DISTRO_EXTRA_RDEPENDS += "\ angstrom-version \ ${ANGSTROM_FEED_CONFIGS} \ - util-linux-ng-mount util-linux-ng-umount \ + util-linux-mount util-linux-umount \ angstrom-libc-fixup-hack \ "