summaryrefslogtreecommitdiff
path: root/packages/meta
diff options
context:
space:
mode:
Diffstat (limited to 'packages/meta')
-rw-r--r--packages/meta/gpe-image-blank-user.bb20
-rw-r--r--packages/meta/gpe-image.bb41
-rw-r--r--packages/meta/meta-gpe-extras.bb28
-rw-r--r--packages/meta/meta-gpe.bb108
-rw-r--r--packages/meta/meta-sectest-gpe.bb87
-rw-r--r--packages/meta/sectest-gpe-image.bb48
-rw-r--r--packages/meta/task-gpe.bb139
7 files changed, 209 insertions, 262 deletions
diff --git a/packages/meta/gpe-image-blank-user.bb b/packages/meta/gpe-image-blank-user.bb
index 1400bde3f1..c8e24ae035 100644
--- a/packages/meta/gpe-image-blank-user.bb
+++ b/packages/meta/gpe-image-blank-user.bb
@@ -1,25 +1,9 @@
-include gpe-collections.bb
+include gpe-image.bb
MAINTAINER = "Rob Taylor <rjt@cambridgebroadband.com"
-PR = "r4"
+PR = "r5"
export IMAGE_BASENAME = "gpe-image-blank-user"
-DEPENDS = "task-bootstrap ${GPE_BASE_DEPENDS} ${GPE_BASE} ${GPE_PIM} \
- ${GPE_BASE_SETTINGS} ${GPE_BASE_APPS} \
- ${GPE_EXTRA_DEPENDS}"
-
-export IPKG_INSTALL = "task-bootstrap ${GPE_BASE_DEPENDS} ${GPE_BASE} \
- ${GPE_PIM} ${GPE_BASE_SETTINGS} \
- ${GPE_BASE_APPS} ${GPE_EXTRA_DEPENDS} \
- ${XSERVER} \
- ${GPE_BASE_RDEPENDS} \
- ${GPE_EXTRA_INSTALL}"
-
-
ROOTFS_POSTPROCESS_COMMAND += "adduser -D user"
-
-
-inherit image_ipk
-LICENSE = MIT
diff --git a/packages/meta/gpe-image.bb b/packages/meta/gpe-image.bb
index 572eef2230..a53c4d4dc0 100644
--- a/packages/meta/gpe-image.bb
+++ b/packages/meta/gpe-image.bb
@@ -8,44 +8,31 @@ PR = "r19"
export IMAGE_BASENAME = "gpe-image"
-GUI_MACHINE_CLASS ?= "none"
-
-GPE_EXTRA_DEPENDS += "${GPE_EXTRA_DEPENDS_${GUI_MACHINE_CLASS}}"
-GPE_EXTRA_INSTALL += "${GPE_EXTRA_INSTALL_${GUI_MACHINE_CLASS}}"
-
GPE_EXTRA_THEMES = "gpe-theme-industrial"
-GPE_EXTRA_DEPENDS_bigscreen = "${GPE_EXTRA_THEMES}"
+GPE_EXTRA_INSTALL_none = ""
GPE_EXTRA_INSTALL_bigscreen = "gpe-task-games ${GPE_EXTRA_THEMES}"
-
-GPE_EXTRA_DEPENDS_smallscreen = "${GPE_EXTRA_THEMES}"
GPE_EXTRA_INSTALL_smallscreen = "gpe-task-games ${GPE_EXTRA_THEMES}"
-#ship more stuff with devices with >16MB of flash
-GPE_BIGFLASH_DEPENDS := '${@base_conditional("ROOT_FLASH_SIZE", "16", "", "\
- gpe-theme-clearlooks \
- figment \
-",d)}'
-
+GUI_MACHINE_CLASS ?= "none"
+GPE_EXTRA_INSTALL += "${GPE_EXTRA_INSTALL_${GUI_MACHINE_CLASS}}"
+#ship more stuff with devices with >16MB of flash
GPE_BIGFLASH_INSTALL := '${@base_conditional("ROOT_FLASH_SIZE", "16", "", "\
- gpe-task-connectivity \
- ${GPE_BIGFLASH_DEPENDS} \
+ gpe-task-connectivity \
+ gpe-theme-clearlooks \
+ figment \
",d)}'
-GPE_EXTRA_DEPENDS += ${GPE_BIGFLASH_DEPENDS}
GPE_EXTRA_INSTALL += ${GPE_BIGFLASH_INSTALL}
-GPE_EXTRA_DEPENDS_none = ""
-GPE_EXTRA_INSTALL_none = ""
-
XSERVER ?= "xserver-kdrive-fbdev"
-DEPENDS = "task-bootstrap \
- meta-gpe \
- ${GPE_EXTRA_DEPENDS}"
+DEPENDS = "task-bootstrap task-gpe"
+RDEPENDS = "${IPKG_INSTALL}"
-RDEPENDS = "\
+export IPKG_INSTALL = "\
+ task-bootstrap \
gpe-task-base \
gpe-task-pim \
gpe-task-settings \
@@ -53,12 +40,6 @@ RDEPENDS = "\
${XSERVER} \
${GPE_EXTRA_INSTALL}"
-export IPKG_INSTALL = "task-bootstrap gpe-task-base \
- gpe-task-pim gpe-task-settings \
- gpe-task-apps ${GPE_EXTRA_DEPENDS} \
- ${XSERVER} \
- ${GPE_EXTRA_INSTALL}"
-
#ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; "
inherit image_ipk
diff --git a/packages/meta/meta-gpe-extras.bb b/packages/meta/meta-gpe-extras.bb
index 1e8c219929..cd9b132b7c 100644
--- a/packages/meta/meta-gpe-extras.bb
+++ b/packages/meta/meta-gpe-extras.bb
@@ -1,27 +1,17 @@
-PACKAGES = gpe-task-apps-extra gpe-task-games gpe-task-web gpe-task-desktopapps
DESCRIPTION = "Meta-package of extra applications for the GPE Palmtop Environment"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-PR="r1"
+LICENSE = MIT
+PR="r2"
ALLOW_EMPTY = 1
+BUILD_ALL_DEPS = "1"
-RDEPENDS_gpe-task-apps-extra := "\
- gpe-filemanager \
- gpe-nmf \
- gpe-soundbite \
- mbmerlin"
+DEPENDS = "task-gpe"
-RDEPENDS_gpe-task-web := "\
- gpe-irc \
- minimo \
- gaim"
+RDEPENDS = "\
+ gpe-task-apps-extra \
+ gpe-task-games \
+ gpe-task-web \
+ gpe-task-desktopapps"
-RDEPENDS_gpe-task-desktopapps := "\
- firefox \
- thunderbird \
- galculator \
- gnumeric \
- gpdf \
- totem"
-LICENSE = MIT
diff --git a/packages/meta/meta-gpe.bb b/packages/meta/meta-gpe.bb
index 347608aaa1..d12621ad65 100644
--- a/packages/meta/meta-gpe.bb
+++ b/packages/meta/meta-gpe.bb
@@ -1,98 +1,18 @@
-PACKAGES = gpe-base-depends gpe-task-base gpe-task-settings gpe-task-pim gpe-task-apps gpe-task-games gpe-task-connectivity
DESCRIPTION = "Meta-package for GPE Palmtop Environment"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-PR = "r41"
+LICENSE = "MIT"
+PR = "r42"
ALLOW_EMPTY = "1"
-
-RDEPENDS_gpe-base-depends := "\
- diet-x11 \
- virtual/xserver"
-
-RDEPENDS_gpe-task-base := "\
- gpe-bootsplash \
- bluez-utils-dbus \
- matchbox \
- xcursor-transparent-theme \
- rxvt-unicode \
- gtk2-theme-angelistic \
- matchbox-themes-gtk \
- xst \
- xhost \
- xrdb \
- gpe-soundserver \
- ttf-bitstream-vera \
- gpe-dm \
- gpe-login \
- gpe-session-scripts \
- gpe-icons \
- gpe-confd \
- gpe-autostarter \
- libgtkstylus \
- detect-stylus \
- suspend-desktop \
- teleport \
- xauth \
- gdk-pixbuf-loader-png \
- gdk-pixbuf-loader-xpm \
- gdk-pixbuf-loader-jpeg \
- pango-module-basic-x \
- pango-module-basic-fc"
-
-RDEPENDS_gpe-task-pim := "\
- gpe-timesheet \
- gpe-todo \
- gpe-calendar \
- gpe-sketchbook \
- gpe-contacts \
- gpe-today \
- gpesyncd"
-
-RDEPENDS_gpe-task-settings := "\
- matchbox-panel-manager \
- gpe-bluetooth \
- gpe-beam \
- gpe-su \
- gpe-conf \
- gpe-clock \
- gpe-mininet \
- gpe-mixer \
- gpe-package \
- gpe-shield \
- gpe-taskmanager \
- keylaunch \
- minilite \
- minimix \
- xmonobut"
-
-RDEPENDS_gpe-task-apps := "\
- gpe-edit \
- gpe-gallery \
- gpe-calculator \
- gpe-clock \
- gpe-plucker \
- gpe-terminal \
- gpe-watch \
- gpe-what \
- matchbox-panel-hacks \
- gpe-aerial \
- gpe-soundbite \
- rosetta"
-
-RDEPENDS_gpe-task-games := "\
- gpe-go \
- gpe-lights \
- gpe-othello \
- gpe-tetris \
- gsoko \
- xdemineur"
-
-RDEPENDS_gpe-task-connectivity := "\
- gpe-mini-browser"
-# gaim
-# linphone-hh
-
-# FIXME - Some dependencies are broken somewhere for this to be needed
-DEPENDS += "matchbox-themes-extra"
-
-LICENSE = "MIT"
+BUILD_ALL_DEPS = "1"
+
+DEPENDS = "task-gpe"
+
+RDEPENDS = "\
+ gpe-base-depends \
+ gpe-task-base \
+ gpe-task-settings \
+ gpe-task-pim \
+ gpe-task-apps \
+ gpe-task-games \
+ gpe-task-connectivity"
diff --git a/packages/meta/meta-sectest-gpe.bb b/packages/meta/meta-sectest-gpe.bb
index 01bd572730..b0f32412d8 100644
--- a/packages/meta/meta-sectest-gpe.bb
+++ b/packages/meta/meta-sectest-gpe.bb
@@ -1,82 +1,17 @@
-PACKAGES = gpe-base-depends gpe-task-base gpe-task-settings gpe-task-pim sectest-task-apps gpe-task-games
DESCRIPTION = "Meta-package for GPE Security Testing Image"
MAINTAINER = "Bob Davies tyggerbob@rogers.com>"
-PR = "r5"
+LICENSE = "MIT"
+PR = "r6"
ALLOW_EMPTY = "1"
+BUILD_ALL_DEPS = "1"
-RDEPENDS_gpe-base-depends := "\
- diet-x11 \
- virtual/xserver"
-
-RDEPENDS_gpe-task-base := "\
- bluez-utils-dbus \
- matchbox \
- xcursor-transparent-theme \
- rxvt-unicode \
- gtk2-theme-angelistic \
- xst \
- xhost \
- xrdb \
- gpe-soundserver \
- ttf-bitstream-vera \
- gpe-dm \
- gpe-login \
- gpe-session-scripts \
- gpe-icons \
- gpe-confd \
- gpe-autostarter \
- libgtkstylus \
- detect-stylus \
- gdk-pixbuf-loader-png \
- gdk-pixbuf-loader-xpm \
- gdk-pixbuf-loader-jpeg \
- pango-module-basic-x \
- pango-module-basic-fc"
-
-RDEPENDS_gpe-task-pim := "\
- figment"
-
-RDEPENDS_gpe-task-settings := "\
- matchbox-panel-manager \
- gpe-bluetooth \
- gpe-beam \
- gpe-su \
- gpe-conf \
- gpe-clock \
- gpe-mininet \
- gpe-mixer \
- gpe-package \
- gpe-shield \
- gpe-taskmanager \
- keylaunch \
- minilite \
- xmonobut"
+DEPENDS = "task-gpe"
-RDEPENDS_sectest-task-apps := "\
- gpe-edit \
- gpe-calculator \
- gpe-clock \
- gpe-terminal \
- gpe-watch \
- gpe-what \
- matchbox-panel-hacks \
- gpe-aerial \
- mbmerlin \
- nmap \
- ettercap \
- stunnel \
- curl \
- dsniff \
- prismstumbler \
- tcpdump \
- kismet \
- hydra \
- thcrut \
- driftnet \
- miniclipboard"
-
-# FIXME - we shouldn't need this. which packages don't set their dependencies correctly?
-DEPENDS += "matchbox-themes-extra gtk-industrial-engine"
-
-LICENSE = "MIT"
+RDEPENDS = "\
+ gpe-task-base \
+ gpe-base-depends \
+ gpe-task-base \
+ gpe-task-settings \
+ gpe-task-pim \
+ gpe-task-sectest"
diff --git a/packages/meta/sectest-gpe-image.bb b/packages/meta/sectest-gpe-image.bb
index 0d1dbfbcbb..39109245f1 100644
--- a/packages/meta/sectest-gpe-image.bb
+++ b/packages/meta/sectest-gpe-image.bb
@@ -1,45 +1,43 @@
MAINTAINER = "Bob Davies <tyggerbob@rogers.com>"
+LICENSE = MIT
+PR = "r5"
+
FEED_URIS_append_openzaurus = " x11##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/x11 \
gpe##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/gpe"
FEED_URIS_append_opensimpad = " x11##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/x11 \
gpe##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/gpe"
FEED_URIS_append_familiar = " x11##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/x11"
-PR = "r5"
-
export IMAGE_BASENAME = "sectest-gpe-image"
-GUI_MACHINE_CLASS ?= "none"
-
-GPE_EXTRA_DEPENDS += "${GPE_EXTRA_DEPENDS_${GUI_MACHINE_CLASS}}"
-GPE_EXTRA_INSTALL += "${GPE_EXTRA_INSTALL_${GUI_MACHINE_CLASS}}"
-
-GPE_EXTRA_THEMES = "gtk-theme-industrial gtk-industrial-engine matchbox-themes-extra-industrial"
-
-#GPE_EXTRA_DEPENDS_bigscreen = "firefox linphone"
-#GPE_EXTRA_INSTALL_bigscreen = "firefox linphone"
-GPE_EXTRA_DEPENDS_bigscreen = "minimo"
-GPE_EXTRA_INSTALL_bigscreen = "minimo gpe-task-games ${GPE_EXTRA_THEMES}"
+GPE_EXTRA_THEMES = "\
+ gtk-theme-industrial \
+ gtk-industrial-engine \
+ matchbox-themes-extra-industrial"
-GPE_EXTRA_DEPENDS_smallscreen = ""
+GPE_EXTRA_INSTALL_none = ""
GPE_EXTRA_INSTALL_smallscreen = "${GPE_EXTRA_THEMES}"
+GPE_EXTRA_INSTALL_bigscreen = "minimo gpe-task-games ${GPE_EXTRA_THEMES}"
+#GPE_EXTRA_INSTALL_bigscreen = "firefox linphone"
-GPE_EXTRA_DEPENDS_none = ""
-GPE_EXTRA_INSTALL_none = ""
+GUI_MACHINE_CLASS ?= "none"
+GPE_EXTRA_INSTALL += "${GPE_EXTRA_INSTALL_${GUI_MACHINE_CLASS}}"
XSERVER ?= "xserver-kdrive-fbdev"
-DEPENDS = "task-bootstrap \
- meta-sectest-gpe \
- ${GPE_EXTRA_DEPENDS}"
+DEPENDS = "task-bootstrap task-gpe"
+RDEPENDS = "${IPKG_INSTALL}"
-export IPKG_INSTALL = "task-bootstrap gpe-task-base \
- gpe-task-pim gpe-task-settings \
- sectest-task-apps ${GPE_EXTRA_DEPENDS} \
- ${XSERVER} \
- ${GPE_EXTRA_INSTALL}"
+export IPKG_INSTALL = "\
+ task-bootstrap \
+ gpe-task-base \
+ gpe-task-pim \
+ gpe-task-settings \
+ gpe-task-sectest \
+ ${XSERVER} \
+ ${GPE_EXTRA_INSTALL}"
ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; "
inherit image_ipk
-LICENSE = MIT
+
diff --git a/packages/meta/task-gpe.bb b/packages/meta/task-gpe.bb
new file mode 100644
index 0000000000..49a456161c
--- /dev/null
+++ b/packages/meta/task-gpe.bb
@@ -0,0 +1,139 @@
+DESCRIPTION = "Task packages for GPE Palmtop Environment"
+PR = "r0"
+LICENSE = MIT
+ALLOW_EMPTY = "1"
+
+PACKAGES = "\
+ gpe-base-depends \
+ gpe-task-base \
+ gpe-task-settings \
+ gpe-task-pim \
+ gpe-task-apps \
+ gpe-task-games \
+ gpe-task-connectivity \
+ gpe-task-apps-extra \
+ gpe-task-games \
+ gpe-task-web \
+ gpe-task-desktopapps \
+ gpe-task-sectest"
+
+RDEPENDS_gpe-base-depends := "\
+ diet-x11 \
+ virtual/xserver"
+
+RDEPENDS_gpe-task-base := "\
+ gpe-bootsplash \
+ bluez-utils-dbus \
+ matchbox \
+ xcursor-transparent-theme \
+ rxvt-unicode \
+ gtk2-theme-angelistic \
+ matchbox-themes-gtk \
+ xst \
+ xhost \
+ xrdb \
+ gpe-soundserver \
+ ttf-bitstream-vera \
+ gpe-dm \
+ gpe-login \
+ gpe-session-scripts \
+ gpe-icons \
+ gpe-confd \
+ gpe-autostarter \
+ libgtkstylus \
+ detect-stylus \
+ suspend-desktop \
+ teleport \
+ xauth \
+ gdk-pixbuf-loader-png \
+ gdk-pixbuf-loader-xpm \
+ gdk-pixbuf-loader-jpeg \
+ pango-module-basic-x \
+ pango-module-basic-fc"
+
+RDEPENDS_gpe-task-pim := "\
+ gpe-timesheet \
+ gpe-todo \
+ gpe-calendar \
+ gpe-sketchbook \
+ gpe-contacts \
+ gpe-today \
+ gpesyncd"
+
+RDEPENDS_gpe-task-settings := "\
+ matchbox-panel-manager \
+ gpe-bluetooth \
+ gpe-beam \
+ gpe-su \
+ gpe-conf \
+ gpe-clock \
+ gpe-mininet \
+ gpe-mixer \
+ gpe-package \
+ gpe-shield \
+ gpe-taskmanager \
+ keylaunch \
+ minilite \
+ minimix \
+ xmonobut"
+
+RDEPENDS_gpe-task-apps := "\
+ gpe-edit \
+ gpe-gallery \
+ gpe-calculator \
+ gpe-clock \
+ gpe-plucker \
+ gpe-terminal \
+ gpe-watch \
+ gpe-what \
+ matchbox-panel-hacks \
+ gpe-aerial \
+ gpe-soundbite \
+ rosetta"
+
+RDEPENDS_gpe-task-games := "\
+ gpe-go \
+ gpe-lights \
+ gpe-othello \
+ gpe-tetris \
+ gsoko \
+ xdemineur"
+
+RDEPENDS_gpe-task-connectivity := "\
+ gpe-mini-browser"
+# gaim
+# linphone-hh
+
+RDEPENDS_gpe-task-apps-extra := "\
+ gpe-filemanager \
+ gpe-nmf \
+ gpe-soundbite \
+ mbmerlin"
+
+RDEPENDS_gpe-task-web := "\
+ gpe-irc \
+ minimo \
+ gaim"
+
+RDEPENDS_gpe-task-desktopapps := "\
+ firefox \
+ thunderbird \
+ galculator \
+ gnumeric \
+ gpdf \
+ totem"
+
+RDEPENDS_gpe-task-sectest := "\
+ mbmerlin \
+ nmap \
+ ettercap \
+ stunnel \
+ curl \
+ dsniff \
+ prismstumbler \
+ tcpdump \
+ kismet \
+ hydra \
+ thcrut \
+ driftnet \
+ miniclipboard"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 21:31:19 +0000