The images development-gnome-image and development-xfce-image share
a large amount of pakages (mainly console utilities). Create a common
base image "development-image" (which can be used standalone too).

Signed-off-by: Stefan Agner <ste...@agner.ch>
---
 recipes-images/angstrom/development-gnome-image.bb | 53 ++------------------
 recipes-images/angstrom/development-image.bb       | 58 ++++++++++++++++++++++
 recipes-images/angstrom/development-xfce-image.bb  | 55 ++------------------
 3 files changed, 64 insertions(+), 102 deletions(-)
 create mode 100644 recipes-images/angstrom/development-image.bb

diff --git a/recipes-images/angstrom/development-gnome-image.bb 
b/recipes-images/angstrom/development-gnome-image.bb
index d198bf4..9518926 100644
--- a/recipes-images/angstrom/development-gnome-image.bb
+++ b/recipes-images/angstrom/development-gnome-image.bb
@@ -1,16 +1,10 @@
-# Image with a GNOME2 desktop and various tools installed
+# Image with a XFCE desktop and various development tools installed
 
-CONMANPKGS = "connman connman-client connman-angstrom-settings 
connman-plugin-loopback connman-plugin-ethernet connman-plugin-wifi 
connman-gnome"
-
-require systemd-image.bb
+require development-image.bb
 
 EXTRA_IMAGE_FEATURES += "splash"
-ARCHTOOLS = ""
-ARCHTOOLS_x86 = "dmidecode"
 
 IMAGE_INSTALL += " \
-       xinput-calibrator \
-       systemd-analyze \
        packagegroup-gnome \
        packagegroup-gnome-apps \
        packagegroup-gnome-themes \
@@ -18,48 +12,7 @@ IMAGE_INSTALL += " \
        packagegroup-core-x11-xserver \
        packagegroup-gnome-fonts \
        \
-       packagegroup-sdk-target \
-       \
-       pciutils \
-       usbutils \
-       i2c-tools \
-       parse-edid \
-       memtester \
-       alsa-utils \
-       devmem2 \
-       iw \
-       bonnie++ \
-       hdparm \
-       iozone3 \
-       iperf \
-       lmbench \
-       rt-tests \
-       evtest \
-       bc \
-       fb-test \
-       tcpdump \
-       procps \
-       util-linux \
-       coreutils \
-       ethtool \
-       bridge-utils \
-       wget \
-       screen \
-       minicom \
-       rsync \
-       vim vim-vimrc \
-       ${ARCHTOOLS} \
-       \
-       git \
-       \
-       e2fsprogs-mke2fs \
-       dosfstools \
-       parted \
-       xfsprogs \
-       btrfs-tools \
-       \
-       python-core python-modules \
+       connman-gnome \
 "
 
 export IMAGE_BASENAME = "development-GNOME-image"
-
diff --git a/recipes-images/angstrom/development-image.bb 
b/recipes-images/angstrom/development-image.bb
new file mode 100644
index 0000000..b5c971a
--- /dev/null
+++ b/recipes-images/angstrom/development-image.bb
@@ -0,0 +1,58 @@
+# Image with target SDK and various development tools installed
+
+CONMANPKGS = "connman connman-client connman-angstrom-settings 
connman-plugin-loopback connman-plugin-ethernet connman-plugin-wifi"
+
+require systemd-image.bb
+
+ARCHTOOLS = ""
+ARCHTOOLS_x86 = "dmidecode"
+
+IMAGE_INSTALL += " \
+       packagegroup-sdk-target \
+       \
+       xinput-calibrator \
+       systemd-analyze \
+       \
+       bash \
+        pciutils \
+       usbutils \
+       i2c-tools \
+       parse-edid \
+       memtester \
+       alsa-utils \
+       devmem2 \
+       iw \
+       bonnie++ \
+       hdparm \
+       iozone3 \
+       iperf \
+       lmbench \
+       rt-tests \
+       evtest \
+       bc \
+       fb-test \
+       tcpdump \
+       procps \
+       util-linux \
+       coreutils \
+       ethtool \
+       bridge-utils \
+       wget \
+       screen \
+       minicom \
+       rsync \
+       vim vim-vimrc \
+       ${ARCHTOOLS} \
+       \
+       git \
+       \
+       e2fsprogs-mke2fs \
+       dosfstools \
+       parted \
+       xfsprogs \
+       btrfs-tools \
+       \
+       python-core python-modules \
+"
+
+export IMAGE_BASENAME = "development-image"
diff --git a/recipes-images/angstrom/development-xfce-image.bb 
b/recipes-images/angstrom/development-xfce-image.bb
index 3b1e50a..42df038 100644
--- a/recipes-images/angstrom/development-xfce-image.bb
+++ b/recipes-images/angstrom/development-xfce-image.bb
@@ -1,16 +1,9 @@
-# Image with a GNOME2 desktop and various tools installed
+# Image with a GNOME2 desktop and various development tools installed
 
-CONMANPKGS = "connman connman-client connman-angstrom-settings 
connman-plugin-loopback connman-plugin-ethernet connman-plugin-wifi 
connman-gnome"
+require development-image.bb
 
-require systemd-image.bb
-
-ARCHTOOLS = ""
-ARCHTOOLS_x86 = "dmidecode"
 
 IMAGE_INSTALL += " \
-       xinput-calibrator \
-       systemd-analyze \
-       \
        packagegroup-xfce-base \
        packagegroup-gnome-xserver-base \
        packagegroup-core-x11-xserver \
@@ -19,48 +12,7 @@ IMAGE_INSTALL += " \
        \
        angstrom-gdm-autologin-hack angstrom-gdm-xfce-hack gdm \
        \
-       packagegroup-sdk-target \
-       \
-       bash \
-        pciutils \
-       usbutils \
-       i2c-tools \
-       parse-edid \
-       memtester \
-       alsa-utils \
-       devmem2 \
-       iw \
-       bonnie++ \
-       hdparm \
-       iozone3 \
-       iperf \
-       lmbench \
-       rt-tests \
-       evtest \
-       bc \
-       fb-test \
-       tcpdump \
-       procps \
-       util-linux \
-       coreutils \
-       ethtool \
-       bridge-utils \
-       wget \
-       screen \
-       minicom \
-       rsync \
-       vim vim-vimrc \
-       ${ARCHTOOLS} \
-       \
-       git \
-       \
-       e2fsprogs-mke2fs \
-       dosfstools \
-       parted \
-       xfsprogs \
-       btrfs-tools \
-       \
-       python-core python-modules \
+       connman-gnome \
 "
 
 export IMAGE_BASENAME = "development-XFCE-image"
@@ -70,4 +22,3 @@ IMAGE_PREPROCESS_COMMAND += "do_delete_gnome_session ; "
 do_delete_gnome_session () {
        rm -f ${IMAGE_ROOTFS}${datadir}/xsessions/gnome.desktop
 }
-
-- 
1.9.1


_______________________________________________
Angstrom-distro-devel mailing list
Angstrom-distro-devel@linuxtogo.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/angstrom-distro-devel

Reply via email to