This is inline with the renaming in OE-Core
Signed-off-by: Khem Raj <raj.k...@gmail.com>
---
conf/distro/angstrom-next.conf | 8 +++---
conf/distro/include/angstrom.inc | 2 +-
contrib/build-feeds.sh | 22 +++++++-------
...k-apps.bb => angstrom-gpe-packagegroup-apps.bb} | 2 +-
...gs.bb => angstrom-gpe-packagegroup-settings.bb} | 4 +--
.../angstrom/angstrom-gpe-task-base.bb | 2 +-
.../angstrom/angstrom-gpe-task-game.bb | 2 +-
recipes-angstrom/angstrom/angstrom-gpe-task-pim.bb | 2 +-
...k-pim.bb => angstrom-ohand-packagegroup-pim.bb} | 2 +-
...k-office.bb => angstrom-packagegroup-office.bb} | 2 +-
...inting.bb => angstrom-packagegroup-printing.bb} | 2 +-
...sectest.bb => angstrom-packagegroup-sectest.bb} | 2 +-
.../angstrom/angstrom-x11-base-depends.bb | 2 +-
.../angstrom-packagegroup-boot.bb} | 10 +++----
.../packagegroups/angstrom-packagegroup-gnome.bb | 21 ++++++++++++++
.../packagegroups/angstrom-packagegroup-gnome3.bb | 21 ++++++++++++++
.../angstrom-zeroconf-audio.bb | 2 +-
.../packagegroup-gnome-apps.bb} | 2 +-
.../packagegroup-gnome-fonts.bb} | 4 +--
.../packagegroup-gnome-gstreamer.bb} | 4 +--
.../packagegroup-gnome-perl.bb} | 4 +--
.../packagegroup-gnome-themes.bb} | 4 +--
.../packagegroup-gnome-xserver-base.bb} | 4 +--
.../packagegroup-gnome.bb} | 2 +-
.../packagegroup-gnome3-apps.bb} | 2 +-
.../packagegroup-gnome3.bb} | 2 +-
recipes-angstrom/tasks/angstrom-task-gnome.bb | 21 --------------
recipes-angstrom/tasks/angstrom-task-gnome3.bb | 21 --------------
recipes-images/angstrom/console-base-image.bb | 30 +++++++++++++++++++-
recipes-images/angstrom/console-image.bb | 4 +--
recipes-images/angstrom/systemd-gnome-image.bb | 12 ++++----
recipes-images/angstrom/systemd-image.bb | 4 +--
recipes-images/angstrom/xfce-nm-image.bb | 8 +++---
33 files changed, 132 insertions(+), 104 deletions(-)
rename recipes-angstrom/angstrom/{angstrom-gpe-task-apps.bb =>
angstrom-gpe-packagegroup-apps.bb} (96%)
rename recipes-angstrom/angstrom/{angstrom-gpe-task-settings.bb =>
angstrom-gpe-packagegroup-settings.bb} (91%)
rename recipes-angstrom/angstrom/{angstrom-ohand-task-pim.bb =>
angstrom-ohand-packagegroup-pim.bb} (91%)
rename recipes-angstrom/angstrom/{angstrom-task-office.bb =>
angstrom-packagegroup-office.bb} (92%)
rename recipes-angstrom/angstrom/{angstrom-task-printing.bb =>
angstrom-packagegroup-printing.bb} (90%)
rename recipes-angstrom/angstrom/{angstrom-task-sectest.bb =>
angstrom-packagegroup-sectest.bb} (93%)
rename recipes-angstrom/{tasks/angstrom-task-boot.bb =>
packagegroups/angstrom-packagegroup-boot.bb} (66%)
create mode 100644
recipes-angstrom/packagegroups/angstrom-packagegroup-gnome.bb
create mode 100644
recipes-angstrom/packagegroups/angstrom-packagegroup-gnome3.bb
rename recipes-angstrom/{tasks => packagegroups}/angstrom-zeroconf-audio.bb
(97%)
rename recipes-angstrom/{tasks/task-gnome-apps.bb =>
packagegroups/packagegroup-gnome-apps.bb} (91%)
rename recipes-angstrom/{tasks/task-gnome-fonts.bb =>
packagegroups/packagegroup-gnome-fonts.bb} (82%)
rename recipes-angstrom/{tasks/task-gnome-gstreamer.bb =>
packagegroups/packagegroup-gnome-gstreamer.bb} (83%)
rename recipes-angstrom/{tasks/task-gnome-perl.bb =>
packagegroups/packagegroup-gnome-perl.bb} (78%)
rename recipes-angstrom/{tasks/task-gnome-themes.bb =>
packagegroups/packagegroup-gnome-themes.bb} (91%)
rename recipes-angstrom/{tasks/task-gnome-xserver-base.bb =>
packagegroups/packagegroup-gnome-xserver-base.bb} (82%)
rename recipes-angstrom/{tasks/task-gnome.bb =>
packagegroups/packagegroup-gnome.bb} (96%)
rename recipes-angstrom/{tasks/task-gnome3-apps.bb =>
packagegroups/packagegroup-gnome3-apps.bb} (91%)
rename recipes-angstrom/{tasks/task-gnome3.bb =>
packagegroups/packagegroup-gnome3.bb} (95%)
delete mode 100644 recipes-angstrom/tasks/angstrom-task-gnome.bb
delete mode 100644 recipes-angstrom/tasks/angstrom-task-gnome3.bb
mode change 120000 => 100644 recipes-images/angstrom/console-base-image.bb
diff --git a/conf/distro/angstrom-next.conf b/conf/distro/angstrom-next.conf
index 41fdd29..675bcaf 100644
--- a/conf/distro/angstrom-next.conf
+++ b/conf/distro/angstrom-next.conf
@@ -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
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index f0ab044..69737b0 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -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
diff --git a/contrib/build-feeds.sh b/contrib/build-feeds.sh
index a81b452..ad5bc68 100755
--- a/contrib/build-feeds.sh
+++ b/contrib/build-feeds.sh
@@ -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 \
"
diff --git a/recipes-angstrom/angstrom/angstrom-gpe-task-apps.bb
b/recipes-angstrom/angstrom/angstrom-gpe-packagegroup-apps.bb
similarity index 96%
rename from recipes-angstrom/angstrom/angstrom-gpe-task-apps.bb
rename to recipes-angstrom/angstrom/angstrom-gpe-packagegroup-apps.bb
index b064013..b57403b 100644
--- a/recipes-angstrom/angstrom/angstrom-gpe-task-apps.bb
+++ b/recipes-angstrom/angstrom/angstrom-gpe-packagegroup-apps.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM =
"file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
PR = "r32"
-inherit task
+inherit packagegroup
PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/recipes-angstrom/angstrom/angstrom-gpe-task-settings.bb
b/recipes-angstrom/angstrom/angstrom-gpe-packagegroup-settings.bb
similarity index 91%
rename from recipes-angstrom/angstrom/angstrom-gpe-task-settings.bb
rename to recipes-angstrom/angstrom/angstrom-gpe-packagegroup-settings.bb
index 11b51fc..cd93478 100644
--- a/recipes-angstrom/angstrom/angstrom-gpe-task-settings.bb
+++ b/recipes-angstrom/angstrom/angstrom-gpe-packagegroup-settings.bb
@@ -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 \
diff --git a/recipes-angstrom/angstrom/angstrom-gpe-task-base.bb
b/recipes-angstrom/angstrom/angstrom-gpe-task-base.bb
index 46e357b..c0fff01 100644
--- a/recipes-angstrom/angstrom/angstrom-gpe-task-base.bb
+++ b/recipes-angstrom/angstrom/angstrom-gpe-task-base.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM =
"file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
PR = "r40"
-inherit task
+inherit packagegroup
PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/recipes-angstrom/angstrom/angstrom-gpe-task-game.bb
b/recipes-angstrom/angstrom/angstrom-gpe-task-game.bb
index 373c529..c24341b 100644
--- a/recipes-angstrom/angstrom/angstrom-gpe-task-game.bb
+++ b/recipes-angstrom/angstrom/angstrom-gpe-task-game.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM =
"file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
PR = "r32"
-inherit task
+inherit packagegroup
RDEPENDS_${PN} = "\
gpe-go \
diff --git a/recipes-angstrom/angstrom/angstrom-gpe-task-pim.bb
b/recipes-angstrom/angstrom/angstrom-gpe-task-pim.bb
index 558e720..ed6f3b4 100644
--- a/recipes-angstrom/angstrom/angstrom-gpe-task-pim.bb
+++ b/recipes-angstrom/angstrom/angstrom-gpe-task-pim.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM =
"file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
PR = "r32"
-inherit task
+inherit packagegroup
RDEPENDS_${PN} = "\
gpe-timesheet \
diff --git a/recipes-angstrom/angstrom/angstrom-ohand-task-pim.bb
b/recipes-angstrom/angstrom/angstrom-ohand-packagegroup-pim.bb
similarity index 91%
rename from recipes-angstrom/angstrom/angstrom-ohand-task-pim.bb
rename to recipes-angstrom/angstrom/angstrom-ohand-packagegroup-pim.bb
index 2e1fa57..4afaca3 100644
--- a/recipes-angstrom/angstrom/angstrom-ohand-task-pim.bb
+++ b/recipes-angstrom/angstrom/angstrom-ohand-packagegroup-pim.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM =
"file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
PR = "r32"
-inherit task
+inherit packagegroup
RDEPENDS_${PN} = "\
dates \
diff --git a/recipes-angstrom/angstrom/angstrom-task-office.bb
b/recipes-angstrom/angstrom/angstrom-packagegroup-office.bb
similarity index 92%
rename from recipes-angstrom/angstrom/angstrom-task-office.bb
rename to recipes-angstrom/angstrom/angstrom-packagegroup-office.bb
index 49407e9..198103d 100644
--- a/recipes-angstrom/angstrom/angstrom-task-office.bb
+++ b/recipes-angstrom/angstrom/angstrom-packagegroup-office.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM =
"file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
PR = "r32"
-inherit task
+inherit packagegroup
RDEPENDS_${PN} = "\
gnumeric \
diff --git a/recipes-angstrom/angstrom/angstrom-task-printing.bb
b/recipes-angstrom/angstrom/angstrom-packagegroup-printing.bb
similarity index 90%
rename from recipes-angstrom/angstrom/angstrom-task-printing.bb
rename to recipes-angstrom/angstrom/angstrom-packagegroup-printing.bb
index 2ece756..053385b 100644
--- a/recipes-angstrom/angstrom/angstrom-task-printing.bb
+++ b/recipes-angstrom/angstrom/angstrom-packagegroup-printing.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM =
"file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
PR = "r32"
-inherit task
+inherit packagegroup
RDEPENDS_${PN} = "\
cups \
diff --git a/recipes-angstrom/angstrom/angstrom-task-sectest.bb
b/recipes-angstrom/angstrom/angstrom-packagegroup-sectest.bb
similarity index 93%
rename from recipes-angstrom/angstrom/angstrom-task-sectest.bb
rename to recipes-angstrom/angstrom/angstrom-packagegroup-sectest.bb
index df69217..56da29b 100644
--- a/recipes-angstrom/angstrom/angstrom-task-sectest.bb
+++ b/recipes-angstrom/angstrom/angstrom-packagegroup-sectest.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM =
"file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
PR = "r33"
-inherit task
+inherit packagegroup
RDEPENDS_${PN} = "\
nmap \
diff --git a/recipes-angstrom/angstrom/angstrom-x11-base-depends.bb
b/recipes-angstrom/angstrom/angstrom-x11-base-depends.bb
index 5c9d113..ceba07d 100644
--- a/recipes-angstrom/angstrom/angstrom-x11-base-depends.bb
+++ b/recipes-angstrom/angstrom/angstrom-x11-base-depends.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM =
"file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
PR = "r45"
-inherit task
+inherit packagegroup
XSERVER ?= "xserver-xorg \
xf86-input-evdev \
diff --git a/recipes-angstrom/tasks/angstrom-task-boot.bb
b/recipes-angstrom/packagegroups/angstrom-packagegroup-boot.bb
similarity index 66%
rename from recipes-angstrom/tasks/angstrom-task-boot.bb
rename to recipes-angstrom/packagegroups/angstrom-packagegroup-boot.bb
index 2757dc3..551e814 100644
--- a/recipes-angstrom/tasks/angstrom-task-boot.bb
+++ b/recipes-angstrom/packagegroups/angstrom-packagegroup-boot.bb
@@ -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 \
"
diff --git a/recipes-angstrom/packagegroups/angstrom-packagegroup-gnome.bb
b/recipes-angstrom/packagegroups/angstrom-packagegroup-gnome.bb
new file mode 100644
index 0000000..dd66b7c
--- /dev/null
+++ b/recipes-angstrom/packagegroups/angstrom-packagegroup-gnome.bb
@@ -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 \
+"
+
diff --git a/recipes-angstrom/packagegroups/angstrom-packagegroup-gnome3.bb
b/recipes-angstrom/packagegroups/angstrom-packagegroup-gnome3.bb
new file mode 100644
index 0000000..d4774ca
--- /dev/null
+++ b/recipes-angstrom/packagegroups/angstrom-packagegroup-gnome3.bb
@@ -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 \
+"
+
diff --git a/recipes-angstrom/tasks/angstrom-zeroconf-audio.bb
b/recipes-angstrom/packagegroups/angstrom-zeroconf-audio.bb
similarity index 97%
rename from recipes-angstrom/tasks/angstrom-zeroconf-audio.bb
rename to recipes-angstrom/packagegroups/angstrom-zeroconf-audio.bb
index 38015db..2a8f1c5 100644
--- a/recipes-angstrom/tasks/angstrom-zeroconf-audio.bb
+++ b/recipes-angstrom/packagegroups/angstrom-zeroconf-audio.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM =
"file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
PR = "r7"
-inherit task allarch
+inherit packagegroup allarch
RDEPENDS_${PN} = " \
avahi-daemon \
diff --git a/recipes-angstrom/tasks/task-gnome-apps.bb
b/recipes-angstrom/packagegroups/packagegroup-gnome-apps.bb
similarity index 91%
rename from recipes-angstrom/tasks/task-gnome-apps.bb
rename to recipes-angstrom/packagegroups/packagegroup-gnome-apps.bb
index 51306f9..b09da71 100644
--- a/recipes-angstrom/tasks/task-gnome-apps.bb
+++ b/recipes-angstrom/packagegroups/packagegroup-gnome-apps.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM =
"file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
PR = "r13"
-inherit task
+inherit packagegroup
RDEPENDS_${PN} = " \
x11vnc \
diff --git a/recipes-angstrom/tasks/task-gnome-fonts.bb
b/recipes-angstrom/packagegroups/packagegroup-gnome-fonts.bb
similarity index 82%
rename from recipes-angstrom/tasks/task-gnome-fonts.bb
rename to recipes-angstrom/packagegroups/packagegroup-gnome-fonts.bb
index 7ba76ca..b183596 100644
--- a/recipes-angstrom/tasks/task-gnome-fonts.bb
+++ b/recipes-angstrom/packagegroups/packagegroup-gnome-fonts.bb
@@ -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 \
diff --git a/recipes-angstrom/tasks/task-gnome-gstreamer.bb
b/recipes-angstrom/packagegroups/packagegroup-gnome-gstreamer.bb
similarity index 83%
rename from recipes-angstrom/tasks/task-gnome-gstreamer.bb
rename to recipes-angstrom/packagegroups/packagegroup-gnome-gstreamer.bb
index 7ba8d43..151b562 100644
--- a/recipes-angstrom/tasks/task-gnome-gstreamer.bb
+++ b/recipes-angstrom/packagegroups/packagegroup-gnome-gstreamer.bb
@@ -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 \
diff --git a/recipes-angstrom/tasks/task-gnome-perl.bb
b/recipes-angstrom/packagegroups/packagegroup-gnome-perl.bb
similarity index 78%
rename from recipes-angstrom/tasks/task-gnome-perl.bb
rename to recipes-angstrom/packagegroups/packagegroup-gnome-perl.bb
index cfc8ec4..bd722ee 100644
--- a/recipes-angstrom/tasks/task-gnome-perl.bb
+++ b/recipes-angstrom/packagegroups/packagegroup-gnome-perl.bb
@@ -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 \
diff --git a/recipes-angstrom/tasks/task-gnome-themes.bb
b/recipes-angstrom/packagegroups/packagegroup-gnome-themes.bb
similarity index 91%
rename from recipes-angstrom/tasks/task-gnome-themes.bb
rename to recipes-angstrom/packagegroups/packagegroup-gnome-themes.bb
index a2e75c7..7b34a46 100644
--- a/recipes-angstrom/tasks/task-gnome-themes.bb
+++ b/recipes-angstrom/packagegroups/packagegroup-gnome-themes.bb
@@ -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 \
diff --git a/recipes-angstrom/tasks/task-gnome-xserver-base.bb
b/recipes-angstrom/packagegroups/packagegroup-gnome-xserver-base.bb
similarity index 82%
rename from recipes-angstrom/tasks/task-gnome-xserver-base.bb
rename to recipes-angstrom/packagegroups/packagegroup-gnome-xserver-base.bb
index 1b3a070..da5894e 100644
--- a/recipes-angstrom/tasks/task-gnome-xserver-base.bb
+++ b/recipes-angstrom/packagegroups/packagegroup-gnome-xserver-base.bb
@@ -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 \
diff --git a/recipes-angstrom/tasks/task-gnome.bb
b/recipes-angstrom/packagegroups/packagegroup-gnome.bb
similarity index 96%
rename from recipes-angstrom/tasks/task-gnome.bb
rename to recipes-angstrom/packagegroups/packagegroup-gnome.bb
index 3087533..db07fae 100644
--- a/recipes-angstrom/tasks/task-gnome.bb
+++ b/recipes-angstrom/packagegroups/packagegroup-gnome.bb
@@ -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 \
diff --git a/recipes-angstrom/tasks/task-gnome3-apps.bb
b/recipes-angstrom/packagegroups/packagegroup-gnome3-apps.bb
similarity index 91%
rename from recipes-angstrom/tasks/task-gnome3-apps.bb
rename to recipes-angstrom/packagegroups/packagegroup-gnome3-apps.bb
index c55c345..d20c8db 100644
--- a/recipes-angstrom/tasks/task-gnome3-apps.bb
+++ b/recipes-angstrom/packagegroups/packagegroup-gnome3-apps.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM =
"file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
PR = "r6"
-inherit task
+inherit packagegroup
RDEPENDS_${PN} = " \
x11vnc \
diff --git a/recipes-angstrom/tasks/task-gnome3.bb
b/recipes-angstrom/packagegroups/packagegroup-gnome3.bb
similarity index 95%
rename from recipes-angstrom/tasks/task-gnome3.bb
rename to recipes-angstrom/packagegroups/packagegroup-gnome3.bb
index 0791cd5..7474da0 100644
--- a/recipes-angstrom/tasks/task-gnome3.bb
+++ b/recipes-angstrom/packagegroups/packagegroup-gnome3.bb
@@ -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 \
diff --git a/recipes-angstrom/tasks/angstrom-task-gnome.bb
b/recipes-angstrom/tasks/angstrom-task-gnome.bb
deleted file mode 100644
index 47e114c..0000000
--- a/recipes-angstrom/tasks/angstrom-task-gnome.bb
+++ /dev/null
@@ -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 \
-"
-
diff --git a/recipes-angstrom/tasks/angstrom-task-gnome3.bb
b/recipes-angstrom/tasks/angstrom-task-gnome3.bb
deleted file mode 100644
index ec25c3e..0000000
--- a/recipes-angstrom/tasks/angstrom-task-gnome3.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION = "Task for a GNOME based image"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM =
"file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
-
-PR = "r6"
-
-inherit task
-
-RDEPENDS_${PN} = " \
- task-gnome3-fonts \
- task-gnome3 \
- task-gnome3-gstreamer \
- task-gnome3-perl \
- task-gnome3-themes \
- task-gnome3-xserver-base \
-"
-
-RRECOMMENDS_${PN} = " \
- task-xserver \
-"
-
diff --git a/recipes-images/angstrom/console-base-image.bb
b/recipes-images/angstrom/console-base-image.bb
deleted file mode 120000
index a0b2625..0000000
--- a/recipes-images/angstrom/console-base-image.bb
+++ /dev/null
@@ -1 +0,0 @@
-systemd-image.bb
\ No newline at end of file
diff --git a/recipes-images/angstrom/console-base-image.bb
b/recipes-images/angstrom/console-base-image.bb
new file mode 100644
index 0000000..c3232d9
--- /dev/null
+++ b/recipes-images/angstrom/console-base-image.bb
@@ -0,0 +1,29 @@
+#Angstrom image to test systemd
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM =
"file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
+
+IMAGE_PREPROCESS_COMMAND = "rootfs_update_timestamp"
+
+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 = ""
+
+IMAGE_INSTALL += " \
+ angstrom-packagegroup-boot \
+ packagegroup-basic \
+ ${CONMANPKGS} \
+ ${ROOTFS_PKGMANAGE_PKGS} \
+ timestamp-service \
+"
+
+IMAGE_DEV_MANAGER = "udev"
+IMAGE_INIT_MANAGER = "systemd"
+IMAGE_INITSCRIPTS = " "
+IMAGE_LOGIN_MANAGER = "tinylogin shadow"
+
+export IMAGE_BASENAME = "systemd-image"
+
+inherit image
diff --git a/recipes-images/angstrom/console-image.bb
b/recipes-images/angstrom/console-image.bb
index c3d3f17..b543a4c 100644
--- a/recipes-images/angstrom/console-image.bb
+++ b/recipes-images/angstrom/console-image.bb
@@ -1,10 +1,10 @@
#Angstrom bootstrap image
require console-base-image.bb
-DEPENDS += "task-base-extended \
+DEPENDS += "packagegroup-base-extended \
"
-IMAGE_INSTALL += "task-base-extended \
+IMAGE_INSTALL += "packagegroup-base-extended \
"
export IMAGE_BASENAME = "console-image"
diff --git a/recipes-images/angstrom/systemd-gnome-image.bb
b/recipes-images/angstrom/systemd-gnome-image.bb
index bf79549..6cc7390 100644
--- a/recipes-images/angstrom/systemd-gnome-image.bb
+++ b/recipes-images/angstrom/systemd-gnome-image.bb
@@ -1,12 +1,12 @@
require systemd-image.bb
IMAGE_INSTALL += " \
- task-gnome \
- task-gnome-apps \
- task-gnome-themes \
- task-gnome-xserver-base \
- task-xserver \
- task-gnome-fonts \
+ packagegroup-gnome \
+ packagegroup-gnome-apps \
+ packagegroup-gnome-themes \
+ packagegroup-gnome-xserver-base \
+ packagegroup-xserver \
+ packagegroup-gnome-fonts \
"
export IMAGE_BASENAME = "systemd-GNOME-image"
diff --git a/recipes-images/angstrom/systemd-image.bb
b/recipes-images/angstrom/systemd-image.bb
index 4406737..c3232d9 100644
--- a/recipes-images/angstrom/systemd-image.bb
+++ b/recipes-images/angstrom/systemd-image.bb
@@ -12,8 +12,8 @@ CONMANPKGS ?= "connman connman-plugin-loopback
connman-plugin-ethernet connman-p
CONMANPKGS_libc-uclibc = ""
IMAGE_INSTALL += " \
- angstrom-task-boot \
- task-basic \
+ angstrom-packagegroup-boot \
+ packagegroup-basic \
${CONMANPKGS} \
${ROOTFS_PKGMANAGE_PKGS} \
timestamp-service \
diff --git a/recipes-images/angstrom/xfce-nm-image.bb
b/recipes-images/angstrom/xfce-nm-image.bb
index 7d36b6b..216badf 100644
--- a/recipes-images/angstrom/xfce-nm-image.bb
+++ b/recipes-images/angstrom/xfce-nm-image.bb
@@ -3,10 +3,10 @@ require systemd-image.bb
CONMANPKGS = "networkmanager network-manager-applet"
IMAGE_INSTALL += " \
- task-xfce-base \
- task-gnome-xserver-base \
- task-xserver \
- task-gnome-fonts \
+ packagegroup-xfce-base \
+ packagegroup-gnome-xserver-base \
+ packagegroup-xserver \
+ packagegroup-gnome-fonts \
angstrom-gdm-autologin-hack angstrom-gdm-xfce-hack gdm gdm-systemd \
angstrom-gnome-icon-theme-enable gtk-engine-clearlooks
gtk-theme-clearlooks angstrom-clearlooks-theme-enable \
"
--
1.7.9.5
_______________________________________________
Angstrom-distro-devel mailing list
Angstrom-distro-devel@linuxtogo.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/angstrom-distro-devel
