diff --git a/conf/distro/angstrom.conf b/conf/distro/angstrom.conf index 039821e..22f7e86 100644 --- a/conf/distro/angstrom.conf +++ b/conf/distro/angstrom.conf @@ -61,8 +61,6 @@ PNBLACKLIST[pn-fso-apm] = "regular apmd is good enough" PNBLACKLIST[gconf-dbus] = "gconf-dbus has been merged back into main GConf" PNBLACKLIST[gconf-dbus-native] = "gconf-dbus has been merged back into main GConf" -# Define splash before it gets set to empty in angstrom-core-tweaks.inc: -SPLASH ?= ' ${@bb.utils.contains("MACHINE_FEATURES", "screen", "dietsplash", "",d)}' require conf/distro/include/angstrom.inc # Prefer openssh over dropbear @@ -70,14 +68,13 @@ TASK_BASIC_SSHDAEMON = "openssh-ssh openssh-sshd openssh-scp openssh-sftp openss # Toolchain virtuals: require conf/distro/include/toolchain-${TOOLCHAIN_TYPE}.inc + # Processor specific tunes like hard float ABI include conf/distro/include/${TARGET_ARCH}-defaults.inc -# Set DISTRO_FEED_CONFIGS to our config var, assigned in the above .inc -DISTRO_FEED_CONFIGS = "${ANGSTROM_FEED_CONFIGS}" # If we're using an .ipk based rootfs, we want to have opkg installed so postinst script can run -# We also take this opportunity to inject angstrom-version and the feed configs into the rootfs -IPKG_VARIANT = "opkg angstrom-version ${ANGSTROM_FEED_CONFIGS}" +# We also take this opportunity to inject angstrom-version +IPKG_VARIANT = "opkg angstrom-version" # Select xserver-xorg as default, since kdrive has been EOL'ed XSERVER ?= "xserver-xorg xf86-input-evdev xf86-input-keyboard xf86-input-mouse xf86-video-fbdev" @@ -95,17 +92,11 @@ DISTRO_BLUETOOTH_MANAGER = "\ DEBUG_APPS ?= "" DEBUG_APPS += '${@oe.utils.conditional("DISTRO_TYPE", "release", "", "strace procps",d)}' -# This hooks into packagegroup-base, so it won't do anything if your images doesn't include packagegroup-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-mount util-linux-umount: busybox mount is broken -# angstrom-libc-fixup-hack: fixes an obscure bug with libc.so symlink -DISTRO_EXTRA_RDEPENDS += "\ +DISTRO_EXTRA_RDEPENDS += " \ angstrom-version \ - ${ANGSTROM_FEED_CONFIGS} \ util-linux-mount util-linux-umount \ - angstrom-libc-fixup-hack \ - " +" # This also hooks into packagegroup-base, but isn't mandatory. # If you don't want parts of this in your packagegroup-base using images you can put this in the image recipe: