summaryrefslogtreecommitdiff
path: root/packages/meta
diff options
context:
space:
mode:
Diffstat (limited to 'packages/meta')
-rw-r--r--packages/meta/meta-opie.bb27
-rw-r--r--packages/meta/meta-sectest-gpe.bb2
-rw-r--r--packages/meta/openslug-packages.bb28
-rw-r--r--packages/meta/opie-collections.inc2
-rw-r--r--packages/meta/task-bootstrap.bb2
-rw-r--r--packages/meta/task-python-sharprom_0.9.0.bb0
-rw-r--r--packages/meta/unslung-able-image.bb4
-rw-r--r--packages/meta/unslung-image.bb51
-rw-r--r--packages/meta/unslung-packages.bb16
-rw-r--r--packages/meta/unslung-standard-image.bb41
10 files changed, 108 insertions, 65 deletions
diff --git a/packages/meta/meta-opie.bb b/packages/meta/meta-opie.bb
index fba4fdf9a1..058f4e4492 100644
--- a/packages/meta/meta-opie.bb
+++ b/packages/meta/meta-opie.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Meta-package for Opie and QPE"
MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
SECTION = "opie/base"
ALLOW_EMPTY = 1
-PR = "r20"
+PR = "r21"
PACKAGE_ARCH = "all"
LICENSE = "MIT"
@@ -10,7 +10,7 @@ PACKAGES = "task-opie-applets task-opie-applications task-opie-base \
task-opie-decorations task-opie-games task-opie-inputmethods \
task-opie-multimedia task-opie-pim task-opie-settings \
task-opie-styles task-opie-todayplugins task-opie-bluetooth \
- task-opie-wlan \
+ task-opie-wlan task-opie-datebookplugins \
task-qpe-applets task-qpe-games task-qpe-inputmethods \
task-qpe-multimedia task-qpe-emulators task-qpe-applications \
task-qpe-fonts task-qpe-settings"
@@ -298,7 +298,7 @@ opie-search \
opie-textedit \
opie-today \
opie-todo "
-RDEPENDS_task-opie-pim = "${task-opie-pim} task-opie-todayplugins"
+RDEPENDS_task-opie-pim = "${task-opie-pim} task-opie-todayplugins task-opie-datebookplugins"
DEPENDS += " ${task-opie-pim}"
task-kdepim = "\
@@ -358,6 +358,13 @@ opie-today-weatherplugin "
RDEPENDS_task-opie-todayplugins = "${task-opie-todayplugins}"
DEPENDS += " ${task-opie-todayplugins}"
+task-opie-datebookplugins= "\
+opie-datebook-birthdayplugin \
+opie-datebook-chrisholidayplugin \
+opie-datebook-nationalholidayplugin "
+RDEPENDS_task-opie-datebookplugins = "${task-opie-datebookplugins}"
+DEPENDS += " ${task-opie-datebookplugins}"
+
task-opie-bluetooth = "\
opie-bluepin \
opie-bluetoothmanager \
@@ -379,12 +386,22 @@ RDEPENDS_task-qpe-emulators = "${task-qpe-emulators}"
DEPENDS += " ${task-qpe-emulators}"
task-qpe-fonts = "\
+qpf-bitstream-vera \
+qpf-bitstream-vera-sans-mono \
+qpf-dejavusans \
+qpf-dejavusansmono \
+qpf-dejavuserif \
+qpf-dejavuserifcondensed \
+qpf-freemono \
+qpf-freeserif \
+qpf-hunky \
+qpf-hunkysans \
+qpf-hunkyserif \
+qpf-qte \
qpf-helvetica \
qpf-unifont \
qpf-utopia \
terminus \
-qpf-bitstream-vera-sans-mono \
-qpf-bitstream-vera \
"
DEPENDS += " ${task-qpe-fonts}"
diff --git a/packages/meta/meta-sectest-gpe.bb b/packages/meta/meta-sectest-gpe.bb
index 5541a1e8c9..ba09c0249e 100644
--- a/packages/meta/meta-sectest-gpe.bb
+++ b/packages/meta/meta-sectest-gpe.bb
@@ -79,11 +79,9 @@ sectest-task-apps = "\
nmap \
ettercap \
stunnel \
- btscanner \
curl \
dsniff \
prismstumbler \
- dillo2 \
tcpdump \
miniclipboard"
diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb
index e69de29bb2..efc550e9fe 100644
--- a/packages/meta/openslug-packages.bb
+++ b/packages/meta/openslug-packages.bb
@@ -0,0 +1,28 @@
+DESCRIPTION = "Packages that are compatible with the OpenSlug firmware"
+LICENSE = MIT
+PR = "r2"
+
+ALLOW_EMPTY = 1
+PACKAGES = "${PN}"
+
+OPENSLUG_PACKAGES = "\
+ atftp \
+ bash \
+ bluez-utils-nodbus \
+ coreutils \
+ miau \
+ microcom \
+ mgetty \
+ mt-daapd \
+ muxsshssl \
+ nail \
+ openssh \
+ ppp puppy \
+ strace sudo \
+ "
+
+BROKEN_PACKAGES = "\
+ "
+
+DEPENDS = 'openslug-image \
+ ${OPENSLUG_PACKAGES}'
diff --git a/packages/meta/opie-collections.inc b/packages/meta/opie-collections.inc
index 1cfcda9ac6..aa87497f1f 100644
--- a/packages/meta/opie-collections.inc
+++ b/packages/meta/opie-collections.inc
@@ -23,7 +23,7 @@ OPIE_FONTS_LARGE = "qte-font-smoothsans-120 qte-font-smoothsans-140 qte-font-smo
OPIE_LIBS_DEPENDS = "qte libopie2 qpf-qte qpf-font-common"
OPIE_LIBS_RDEPENDS = "${OPIE_FONTS_SMALL}"
-OPIE_BASE = "opie-pics opie-sounds opie-qcop opie-quicklauncher opie-taskbar"
+OPIE_BASE = "opie-qcop opie-qss opie-quicklauncher opie-taskbar opie-pics opie-sounds"
#
# High res displays need some additional larger fonts
diff --git a/packages/meta/task-bootstrap.bb b/packages/meta/task-bootstrap.bb
index f7cade5495..723ce82832 100644
--- a/packages/meta/task-bootstrap.bb
+++ b/packages/meta/task-bootstrap.bb
@@ -33,7 +33,7 @@ def bootstrap_modutils_rdepends(d):
HOTPLUG ?= "linux-hotplug"
-DEPENDS = 'base-files base-passwd-3.5.7 \
+DEPENDS = 'base-files base-passwd-3.5.9 \
busybox dropbear initscripts modutils netbase \
sysvinit tinylogin portmap \
modutils-initscripts \
diff --git a/packages/meta/task-python-sharprom_0.9.0.bb b/packages/meta/task-python-sharprom_0.9.0.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/meta/task-python-sharprom_0.9.0.bb
diff --git a/packages/meta/unslung-able-image.bb b/packages/meta/unslung-able-image.bb
deleted file mode 100644
index b5337f0c4e..0000000000
--- a/packages/meta/unslung-able-image.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-IMAGE_VARIANT = "able"
-
-include unslung-standard-image.bb
-LICENSE = MIT
diff --git a/packages/meta/unslung-image.bb b/packages/meta/unslung-image.bb
index b2ed33a88d..48943b5d5f 100644
--- a/packages/meta/unslung-image.bb
+++ b/packages/meta/unslung-image.bb
@@ -1,4 +1,49 @@
-# Put the standard image last, so that the kernel modules that are built will work on both.
-DEPENDS = "unslung-able-image unslung-standard-image"
-EXCLUDE_FROM_WORLD = "1"
LICENSE = MIT
+PR = "r5"
+
+IMAGE_BASENAME = "unslung"
+
+IMAGE_LINGUAS = ""
+USE_DEVFS = "1"
+
+DEPENDS = "unslung-kernel unslung-rootfs \
+ glibc slingbox ipkg wget cpio findutils portmap-unslung \
+ ${UNSLUNG_EXTRA_DEPENDS}"
+
+IPKG_INSTALL = "unslung-rootfs \
+ libc6-unslung slingbox ipkg wget cpio findutils portmap-unslung \
+ ${UNSLUNG_EXTRA_INSTALL}"
+
+IMAGE_PREPROCESS_COMMAND += "unslung_clean_image; "
+
+inherit image_ipk
+
+# Note that anything in this function must be repeatable without having to rebuild the rootfs
+unslung_clean_image () {
+ # Remove the patches
+ rm -rf ${IMAGE_ROOTFS}/patches
+ # Remove the kernel image
+ rm -rf ${IMAGE_ROOTFS}/boot
+ # Remove info from the local feed used to build the image
+ rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/lists/*
+ rm -f ${IMAGE_ROOTFS}/${sysconfdir}/version
+ # Tidy up some thing which are in the wrong place
+ mv ${IMAGE_ROOTFS}${libdir}/libipkg* ${IMAGE_ROOTFS}/lib/
+ # Hack out the modutils stuff - it's too hard to make it work
+ rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/info/update-modules.postinst
+ rm -rf ${IMAGE_ROOTFS}/etc/rcS.d
+ echo "#!/bin/sh" > ${IMAGE_ROOTFS}/usr/sbin/update-modules
+ echo "exit 0" >> ${IMAGE_ROOTFS}/usr/sbin/update-modules
+ chmod ugo+x ${IMAGE_ROOTFS}/usr/sbin/update-modules
+ echo "#!/bin/sh" > ${IMAGE_ROOTFS}/sbin/depmod
+ echo "exit 0" >> ${IMAGE_ROOTFS}/sbin/depmod
+ chmod ugo+x ${IMAGE_ROOTFS}/sbin/depmod
+}
+
+python () {
+ # Don't build unslung images unless we're targeting an nslu2
+ mach = bb.data.getVar("MACHINE", d, 1)
+ dist = bb.data.getVar("DISTRO", d, 1)
+ if mach != 'nslu2' or dist != 'unslung':
+ raise bb.parse.SkipPackage("Unslung only builds for the Linksys NSLU2")
+}
diff --git a/packages/meta/unslung-packages.bb b/packages/meta/unslung-packages.bb
index 22205c9573..53355d79e0 100644
--- a/packages/meta/unslung-packages.bb
+++ b/packages/meta/unslung-packages.bb
@@ -1,15 +1,15 @@
DESCRIPTION = "Packages that are compatible with the Unslung firmware"
-PR = "r1"
+LICENSE = MIT
+PR = "r2"
ALLOW_EMPTY = 1
PACKAGES = "${PN}"
-DEPENDS = ' \
- ${UNSLUNG_EXTRA_DEPENDS}'
+UNSLUNG_PACKAGES = "\
+ "
-RDEPENDS = ' \
- ${UNSLUNG_EXTRA_RDEPENDS}'
+BROKEN_PACKAGES = "\
+ "
-RRECOMMENDS = ' \
- ${UNSLUNG_EXTRA_RRECOMMENDS}'
-LICENSE = MIT
+DEPENDS = 'unslung-image \
+ ${UNSLUNG_PACKAGES}'
diff --git a/packages/meta/unslung-standard-image.bb b/packages/meta/unslung-standard-image.bb
deleted file mode 100644
index ae2bfd44fb..0000000000
--- a/packages/meta/unslung-standard-image.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-PR = "r3"
-
-IMAGE_LINGUAS = ""
-USE_DEVFS = "1"
-
-UNSLUNG_BASE_DEPENDS = "glibc slingbox ipkg wget cpio findutils portmap-unslung"
-UNSLUNG_BASE_PACKAGES = "libc6-unslung slingbox ipkg wget cpio findutils portmap-unslung"
-
-IMAGE_VARIANT ?= "standard"
-
-export IMAGE_BASENAME = "unslung-${IMAGE_VARIANT}"
-
-IPKG_INSTALL = "unslung-${IMAGE_VARIANT}-rootfs \
- ${UNSLUNG_BASE_PACKAGES} ${UNSLUNG_EXTRA_PACKAGES}"
-
-DEPENDS = "unslung-${IMAGE_VARIANT}-kernel unslung-${IMAGE_VARIANT}-rootfs \
- ${UNSLUNG_BASE_DEPENDS} ${UNSLUNG_EXTRA_DEPENDS}"
-
-RDEPENDS = "${UNSLUNG_BASE_PACKAGES} ${UNSLUNG_EXTRA_RDEPENDS}"
-
-RRECOMMENDS = "${UNSLUNG_EXTRA_RRECOMMENDS}"
-
-IMAGE_PREPROCESS_COMMAND += "unslung_clean_image; "
-
-inherit image_ipk
-
-# Note that anything in this function must be repeatable without having to rebuild the rootfs
-unslung_clean_image () {
- # Remove info from the local feed used to build the image
- rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/lists/*
- rm -f ${IMAGE_ROOTFS}/${sysconfdir}/version
-}
-
-python () {
- # Don't build unslung images unless we're targeting an nslu2
- mach = bb.data.getVar("MACHINE", d, 1)
- dist = bb.data.getVar("DISTRO", d, 1)
- if mach != 'nslu2' or dist != 'unslung':
- raise bb.parse.SkipPackage("Unslung only builds for the Linksys NSLU2")
-}
-LICENSE = MIT
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-06 06:36:18 +0000