Permalink
Browse files

angstrom: Adjust for task -> packagegroup rename

This is inline with the renaming in OE-Core

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
  • Loading branch information...
1 parent 2caccb8 commit 50f688d7a0310b7e4db3f3c08a6c2eb1f61d0df9 @kraj kraj committed with koenkooi Sep 7, 2012
Showing with 132 additions and 104 deletions.
  1. +4 −4 conf/distro/angstrom-next.conf
  2. +1 −1 conf/distro/include/angstrom.inc
  3. +11 −11 contrib/build-feeds.sh
  4. +1 −1 recipes-angstrom/angstrom/{angstrom-gpe-task-apps.bb → angstrom-gpe-packagegroup-apps.bb}
  5. +2 −2 recipes-angstrom/angstrom/{angstrom-gpe-task-settings.bb → angstrom-gpe-packagegroup-settings.bb}
  6. +1 −1 recipes-angstrom/angstrom/angstrom-gpe-task-base.bb
  7. +1 −1 recipes-angstrom/angstrom/angstrom-gpe-task-game.bb
  8. +1 −1 recipes-angstrom/angstrom/angstrom-gpe-task-pim.bb
  9. +1 −1 recipes-angstrom/angstrom/{angstrom-ohand-task-pim.bb → angstrom-ohand-packagegroup-pim.bb}
  10. +1 −1 recipes-angstrom/angstrom/{angstrom-task-office.bb → angstrom-packagegroup-office.bb}
  11. +1 −1 recipes-angstrom/angstrom/{angstrom-task-printing.bb → angstrom-packagegroup-printing.bb}
  12. +1 −1 recipes-angstrom/angstrom/{angstrom-task-sectest.bb → angstrom-packagegroup-sectest.bb}
  13. +1 −1 recipes-angstrom/angstrom/angstrom-x11-base-depends.bb
  14. +5 −5 recipes-angstrom/{tasks/angstrom-task-boot.bb → packagegroups/angstrom-packagegroup-boot.bb}
  15. +21 −0 recipes-angstrom/packagegroups/angstrom-packagegroup-gnome.bb
  16. +21 −0 recipes-angstrom/packagegroups/angstrom-packagegroup-gnome3.bb
  17. +1 −1 recipes-angstrom/{tasks → packagegroups}/angstrom-zeroconf-audio.bb
  18. +1 −1 recipes-angstrom/{tasks/task-gnome-apps.bb → packagegroups/packagegroup-gnome-apps.bb}
  19. +2 −2 recipes-angstrom/{tasks/task-gnome-fonts.bb → packagegroups/packagegroup-gnome-fonts.bb}
  20. +2 −2 recipes-angstrom/{tasks/task-gnome-gstreamer.bb → packagegroups/packagegroup-gnome-gstreamer.bb}
  21. +2 −2 recipes-angstrom/{tasks/task-gnome-perl.bb → packagegroups/packagegroup-gnome-perl.bb}
  22. +2 −2 recipes-angstrom/{tasks/task-gnome-themes.bb → packagegroups/packagegroup-gnome-themes.bb}
  23. +2 −2 ...es-angstrom/{tasks/task-gnome-xserver-base.bb → packagegroups/packagegroup-gnome-xserver-base.bb}
  24. +1 −1 recipes-angstrom/{tasks/task-gnome.bb → packagegroups/packagegroup-gnome.bb}
  25. +1 −1 recipes-angstrom/{tasks/task-gnome3-apps.bb → packagegroups/packagegroup-gnome3-apps.bb}
  26. +1 −1 recipes-angstrom/{tasks/task-gnome3.bb → packagegroups/packagegroup-gnome3.bb}
  27. +0 −21 recipes-angstrom/tasks/angstrom-task-gnome.bb
  28. +0 −21 recipes-angstrom/tasks/angstrom-task-gnome3.bb
  29. +0 −1 recipes-images/angstrom/console-base-image.bb
  30. +29 −0 recipes-images/angstrom/console-base-image.bb
  31. +2 −2 recipes-images/angstrom/console-image.bb
  32. +6 −6 recipes-images/angstrom/systemd-gnome-image.bb
  33. +2 −2 recipes-images/angstrom/systemd-image.bb
  34. +4 −4 recipes-images/angstrom/xfce-nm-image.bb
@@ -136,7 +136,7 @@ IPKG_VARIANT = "opkg angstrom-version ${ANGSTROM_FEED_CONFIGS}"
# 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"
-# do some task-base stuff here
+# do some packagegroup-base stuff here
# Prefer bluez4, it's needed for things like connman. Bluez4 is also largely backward compatible with
# bluez 3.x
@@ -149,7 +149,7 @@ DISTRO_BLUETOOTH_MANAGER = "\
DEBUG_APPS ?= ""
DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "strace procps",d)}'
-# This hooks into task-base, so it won't do anything if your images doesn't include task-base.
+# 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
@@ -161,8 +161,8 @@ DISTRO_EXTRA_RDEPENDS += "\
angstrom-libc-fixup-hack \
"
-# This also hooks into task-base, but isn't mandatory.
-# If you don't want parts of this in your task-base using images you can put this in the image recipe:
+# 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:
# BAD_RECOMMENDATIONS = "avahi-daemon avahi-autoipd"
# Note that BAD_RECOMMENDATIONS is a feature of rootfs_ipk.bbclass, not angstrom
# kernel modules: ship fs modules so you can mount stuff and af-packet so networking works
@@ -153,7 +153,7 @@ DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}"
# Angstrom *always* has some form of release config, so error out if someone thinks he knows better
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 task(-core)-base)
+# 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"
# USE-flag like features
View
@@ -75,7 +75,7 @@ do
opkg-native \
abiword \
aircrack-ng \
- angstrom-task-gnome \
+ angstrom-packagegroup-gnome \
angstrom-zeroconf-audio \
apache2 \
artoolkit \
@@ -334,13 +334,13 @@ do
sylpheed \
sysstat \
systray \
- task-beagleboard-demo \
- task-gpe-pim \
- task-opie-apps \
- task-opie-games \
- task-proper-tools \
- task-xqtlauncher \
- tasks \
+ packagegroup-beagleboard-demo \
+ packagegroup-gpe-pim \
+ packagegroup-opie-apps \
+ packagegroup-opie-games \
+ packagegroup-proper-tools \
+ packagegroup-xqtlauncher \
+ packagegroups \
texinfo \
tgt \
thttpd \
@@ -434,9 +434,9 @@ for machine in ${MACHINES}
do
BUILD_MACHINE=$machine
BUILD_CLEAN="qmake-native qmake2-native qt-x11-free python python-native python-pygtk gnome-icon-theme"
- BUILD_TARGETS="task-base task-boot \
- task-opie task-opie-all \
- angstrom-x11-base-depends angstrom-gpe-task-settings \
+ BUILD_TARGETS="packagegroup-base packagegroup-boot \
+ packagegroup-opie packagegroup-opie-all \
+ angstrom-x11-base-depends angstrom-gpe-packagegroup-settings \
xserver-xorg-conf \
"
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
PR = "r32"
-inherit task
+inherit packagegroup
PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -4,12 +4,12 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
PR = "r36"
-inherit task
+inherit packagegroup
RDEPENDS_${PN} = "\
matchbox-panel-manager \
mboxkbd-layouts-gui \
- gpe-su \
+ gpe-su \
gpe-conf \
gpe-shield \
gpe-taskmanager \
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
PR = "r40"
-inherit task
+inherit packagegroup
PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
PR = "r32"
-inherit task
+inherit packagegroup
RDEPENDS_${PN} = "\
gpe-go \
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
PR = "r32"
-inherit task
+inherit packagegroup
RDEPENDS_${PN} = "\
gpe-timesheet \
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
PR = "r32"
-inherit task
+inherit packagegroup
RDEPENDS_${PN} = "\
dates \
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
PR = "r32"
-inherit task
+inherit packagegroup
RDEPENDS_${PN} = "\
gnumeric \
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
PR = "r32"
-inherit task
+inherit packagegroup
RDEPENDS_${PN} = "\
cups \
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
PR = "r33"
-inherit task
+inherit packagegroup
RDEPENDS_${PN} = "\
nmap \
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
PR = "r45"
-inherit task
+inherit packagegroup
XSERVER ?= "xserver-xorg \
xf86-input-evdev \
@@ -1,22 +1,22 @@
-DESCRIPTION = "Basic task to get an Angstrom powered device booting"
+DESCRIPTION = "Basic packagegroup to get an Angstrom powered device booting"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
-PR = "r4"
+PR = "r5"
-inherit task
+inherit packagegroup
# packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH
#
PACKAGE_ARCH = "${MACHINE_ARCH}"
-DEPENDS = "task-boot"
+DEPENDS = "packagegroup-boot"
#
# minimal set of packages - needed to boot
#
RDEPENDS_${PN} = "\
- task-boot \
+ packagegroup-boot \
angstrom-version \
"
@@ -0,0 +1,21 @@
+DESCRIPTION = "Task for a full GNOME based image"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
+
+PR = "r13"
+
+inherit packagegroup
+
+RDEPENDS_${PN} = " \
+ packagegroup-gnome-fonts \
+ packagegroup-gnome \
+ packagegroup-gnome-gstreamer \
+ packagegroup-gnome-perl \
+ packagegroup-gnome-themes \
+ packagegroup-gnome-xserver-base \
+"
+
+RRECOMMENDS_${PN} = " \
+ packagegroup-xserver \
+"
+
@@ -0,0 +1,21 @@
+DESCRIPTION = "Task for a GNOME based image"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
+
+PR = "r6"
+
+inherit packagegroup
+
+RDEPENDS_${PN} = " \
+ packagegroup-gnome3-fonts \
+ packagegroup-gnome3 \
+ packagegroup-gnome3-gstreamer \
+ packagegroup-gnome3-perl \
+ packagegroup-gnome3-themes \
+ packagegroup-gnome3-xserver-base \
+"
+
+RRECOMMENDS_${PN} = " \
+ packagegroup-xserver \
+"
+
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
PR = "r7"
-inherit task allarch
+inherit packagegroup allarch
RDEPENDS_${PN} = " \
avahi-daemon \
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
PR = "r13"
-inherit task
+inherit packagegroup
RDEPENDS_${PN} = " \
x11vnc \
@@ -4,10 +4,10 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
PR = "r13"
-inherit task
+inherit packagegroup
# for backwards compatibility
-RPROVIDES_${PN} += "task-gnome3-fonts"
+RPROVIDES_${PN} += "packagegroup-gnome3-fonts"
RDEPENDS_${PN} = " \
fontconfig fontconfig-utils font-util \
@@ -4,10 +4,10 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
PR = "r13"
-inherit task
+inherit packagegroup
# for backwards compatibility
-RPROVIDES_${PN} += "task-gnome3-gstreamer"
+RPROVIDES_${PN} += "packagegroup-gnome3-gstreamer"
DEPENDS_${PN} = " \
gst-plugins-base \
@@ -4,10 +4,10 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
PR = "r13"
-inherit task
+inherit packagegroup
# for backwards compatibility
-RPROVIDES_${PN} += "task-gnome3-perl"
+RPROVIDES_${PN} += "packagegroup-gnome3-perl"
RDEPENDS_${PN} = " \
perl \
@@ -4,10 +4,10 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
PR = "r13"
-inherit task
+inherit packagegroup
# for backwards compatibility
-RPROVIDES_${PN} += "task-gnome3-themes"
+RPROVIDES_${PN} += "packagegroup-gnome3-themes"
RDEPENDS_${PN} = " \
angstrom-gnome-icon-theme-enable \
@@ -4,10 +4,10 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
PR = "r13"
-inherit task
+inherit packagegroup
# for backwards compatibility
-RPROVIDES_${PN} += "task-gnome3-xserver-base"
+RPROVIDES_${PN} += "packagegroup-gnome3-xserver-base"
RDEPENDS_${PN} = " \
dbus-x11 \
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
PR = "r13"
-inherit task
+inherit packagegroup
RDEPENDS_${PN} = " \
gnome-settings-daemon gnome-control-center \
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
PR = "r6"
-inherit task
+inherit packagegroup
RDEPENDS_${PN} = " \
x11vnc \
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
PR = "r6"
-inherit task
+inherit packagegroup
RDEPENDS_${PN} = " \
gnome-settings-daemon gnome-control-center \
@@ -1,21 +0,0 @@
-DESCRIPTION = "Task for a full GNOME based image"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
-
-PR = "r13"
-
-inherit task
-
-RDEPENDS_${PN} = " \
- task-gnome-fonts \
- task-gnome \
- task-gnome-gstreamer \
- task-gnome-perl \
- task-gnome-themes \
- task-gnome-xserver-base \
-"
-
-RRECOMMENDS_${PN} = " \
- task-xserver \
-"
-
Oops, something went wrong.

0 comments on commit 50f688d

Please sign in to comment.