diff options
author | Max Krummenacher <max.krummenacher@toradex.com> | 2012-06-12 14:20:25 +0200 |
---|---|---|
committer | Max Krummenacher <max.krummenacher@toradex.com> | 2012-06-12 14:20:25 +0200 |
commit | b3f0841ade3dc1cbd1b7dd825439cb03a02629d2 (patch) | |
tree | 1b3204eabb54494b91d8579fbb7d2e556a2ec245 /recipes | |
parent | 5f8b970f28d6ca6c2173b3deda0c0dafe5d9d466 (diff) |
- mklibs is no longer downloadable in the 0.1.33 version, upgrade to next version
Diffstat (limited to 'recipes')
-rw-r--r-- | recipes/images/angstrom-lxde-image.bb | 6 | ||||
-rw-r--r-- | recipes/images/angstrom-lxde-image.bb~ | 103 |
2 files changed, 4 insertions, 105 deletions
diff --git a/recipes/images/angstrom-lxde-image.bb b/recipes/images/angstrom-lxde-image.bb index 1b7b314..4ca8136 100644 --- a/recipes/images/angstrom-lxde-image.bb +++ b/recipes/images/angstrom-lxde-image.bb @@ -16,6 +16,7 @@ IMAGE_PREPROCESS_COMMAND = "rootfs_update_timestamp" # xorg-minimal-fonts xserver-xorg-multimedia-modules xerver-xorg-utils xrandr IMAGE_SPLASH = "psplash-angstrom" +PREFERRED_PROVIDER_psplash-support = "psplash-angstrom" DISTRO_UPDATE_ALTERNATIVES ??= "" ROOTFS_PKGMANAGE_PKGS ?= '${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "${ROOTFS_PKGMANAGE} ${DISTRO_UPDATE_ALTERNATIVES}", d)}' @@ -48,6 +49,7 @@ IMAGE_INSTALL += " \ task-basic \ ${CONMANPKGS} \ ${ROOTFS_PKGMANAGE_PKGS} \ + timestamp-service \ task-base-extended \ ${IMAGE_SPLASH} \ ${XSERVER} \ @@ -93,8 +95,8 @@ include lx.inc include trdx-extra.inc IMAGE_DEV_MANAGER = "udev" -IMAGE_INIT_MANAGER = "sysvinit sysvinit-pidof" -IMAGE_INITSCRIPTS = "initscripts" +IMAGE_INIT_MANAGER = "systemd" +IMAGE_INITSCRIPTS = " " IMAGE_LOGIN_MANAGER = "tinylogin shadow" export IMAGE_BASENAME = "LXDE-image" diff --git a/recipes/images/angstrom-lxde-image.bb~ b/recipes/images/angstrom-lxde-image.bb~ deleted file mode 100644 index 8e39f51..0000000 --- a/recipes/images/angstrom-lxde-image.bb~ +++ /dev/null @@ -1,103 +0,0 @@ -#Angstrom image -DESCRIPTION = "Image based on the LXDE desktop" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" - -#create the file /etc/timestamp -IMAGE_PREPROCESS_COMMAND = "rootfs_update_timestamp" - -#IMAGE_LINGUAS = "" -#IMAGE_LINGUAS = "en-us" -#IMAGE_LINGUAS = "de-de fr-fr en-gb en-us pt-br es-es kn-in ml-in ta-in" -#ROOTFS_POSTPROCESS_COMMAND += 'install_linguas; ' - -#MAYBE WE WILL NEED THESE ALSO: -# xorg-minimal-fonts xserver-xorg-multimedia-modules xerver-xorg-utils xrandr - -IMAGE_SPLASH = "psplash-angstrom" - -DISTRO_UPDATE_ALTERNATIVES ??= "" -ROOTFS_PKGMANAGE_PKGS ?= '${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "${ROOTFS_PKGMANAGE} ${DISTRO_UPDATE_ALTERNATIVES}", d)}' - -CONMANPKGS ?= "connman connman-plugin-loopback connman-plugin-ethernet connman-plugin-wifi connman-systemd" -CONMANPKGS_libc-uclibc = "" - -DEPENDS += "gst-plugins-good gst-plugins-bad gst-plugins-ugly" - -# Additional X libs not pulled in by any package \ -# xtrans libxdamage libxvmc libxinerama libxevie \ - -# Required for starting X but not RDEPEND by the using package \ -# libxcursor \ - -# glib-2.0 has some additional packages which are not pulled in, let's do this here \ -# gobject-2.0 gmodule-2.0 gthread-2.0 gio-2.0 \ - -# this would pull in a large amount of gst-plugins, we only add a selected few -# gst-plugins-base-meta \ -# gst-plugins-good-meta \ -# gst-plugins-bad-meta \ -# gst-ffmpeg \ - -# needed by nvidia commandline player \ -# libpcre \ - -IMAGE_INSTALL += " \ - angstrom-task-boot \ - task-basic \ - ${CONMANPKGS} \ - ${ROOTFS_PKGMANAGE_PKGS} \ - task-base-extended \ - ${IMAGE_SPLASH} \ - ${XSERVER} \ - \ - libxdamage libxvmc libxinerama \ - libxcursor \ - xtrans \ - \ - bash \ - tinylogin \ - \ - gstreamer \ - gst-plugins-base \ - gst-plugins-base-alsa \ - gst-plugins-base-audioconvert \ - gst-plugins-base-audioresample \ - gst-plugins-base-audiotestsrc \ - gst-plugins-base-decodebin \ - gst-plugins-base-decodebin2 \ - gst-plugins-base-playbin \ - gst-plugins-base-typefindfunctions \ - gst-plugins-base-ivorbisdec \ - gst-plugins-base-ogg \ - gst-plugins-base-theora \ - gst-plugins-base-videotestsrc \ - gst-plugins-base-vorbis \ - gst-plugins-good-matroska \ - gst-plugins-good-rtp \ - gst-plugins-good-udp \ - gst-plugins-good-avi \ - gst-plugins-good-wavenc \ - gst-plugins-good-wavparse \ - gst-plugins-ugly-asf \ - libpcre \ - libxcomposite \ - firefox \ - flash-plugins \ -" -#libxevie -# gst-plugin-qtdemux \ -# gst-plugin-mpegdemux \ - -include lx.inc -include trdx-extra.inc - -IMAGE_DEV_MANAGER = "udev" -IMAGE_INIT_MANAGER = "sysvinit sysvinit-pidof" -IMAGE_INITSCRIPTS = "initscripts" -IMAGE_LOGIN_MANAGER = "tinylogin shadow" - -export IMAGE_BASENAME = "LXDE-image" - -inherit image |