diff options
Diffstat (limited to 'packages/angstrom')
20 files changed, 163 insertions, 62 deletions
diff --git a/packages/angstrom/angstrom-bootmanager-image.bb b/packages/angstrom/angstrom-bootmanager-image.bb index 43c25eb1ba..d829590188 100644 --- a/packages/angstrom/angstrom-bootmanager-image.bb +++ b/packages/angstrom/angstrom-bootmanager-image.bb @@ -1,13 +1,9 @@ #Angstrom bootmanager image -LICENSE = "MIT" -PR = "r0" DEPENDS = "task-angstrom" -RDEPENDS = "angstrom-base-depends angstrom-bootmanager" +IMAGE_INSTALL = "angstrom-base-depends angstrom-bootmanager" export IMAGE_BASENAME = "bootmanager-image" -export IMAGE_LINGUAS = "" -export PACKAGE_INSTALL = "${RDEPENDS}" inherit image diff --git a/packages/angstrom/angstrom-console-image.bb b/packages/angstrom/angstrom-console-image.bb index b662109a3c..1684716187 100644 --- a/packages/angstrom/angstrom-console-image.bb +++ b/packages/angstrom/angstrom-console-image.bb @@ -1,6 +1,4 @@ #Angstrom bootstrap image -LICENSE = "MIT" -PR = "r8" ANGSTROM_EXTRA_INSTALL ?= "" @@ -8,14 +6,13 @@ DEPENDS = "task-base-extended \ ${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",d)} \ " -RDEPENDS = "task-base-extended \ +IMAGE_INSTALL = "task-base-extended \ ${ANGSTROM_EXTRA_INSTALL} \ ${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",d)} \ " export IMAGE_BASENAME = "console-image" -export IMAGE_LINGUAS = "" -export PACKAGE_INSTALL = "${RDEPENDS}" +IMAGE_LINGUAS = "" inherit image diff --git a/packages/angstrom/angstrom-feed-configs.bb b/packages/angstrom/angstrom-feed-configs.bb new file mode 100644 index 0000000000..6730b6a044 --- /dev/null +++ b/packages/angstrom/angstrom-feed-configs.bb @@ -0,0 +1,32 @@ +DESCRIPTION = "Configuration files for online package repositories aka feeds" + +PR = "1" +PACKAGE_ARCH = "${MACHINE_ARCH}" + +FEED_BASEPATH ?= "unstable/feed/" + +do_compile() { + mkdir -p ${S}/${sysconfdir}/ipkg + for feed in base debug perl python gstreamer ; do + echo "src/gz ${feed} ${ANGSTROM_URI}/${FEED_BASEPATH}${FEED_ARCH}/${feed}" > ${S}/${sysconfdir}/ipkg/${feed}-feed.conf + done + + echo "src/gz ${MACHINE_ARCH} ${ANGSTROM_URI}/${FEED_BASEPATH}${FEED_ARCH}/${MACHINE_ARCH}" > ${S}/${sysconfdir}/ipkg/${MACHINE_ARCH}-feed.conf + echo "src/gz no-arch ${ANGSTROM_URI}/${FEED_BASEPATH}/all" > ${S}/${sysconfdir}/ipkg/noarch-feed.conf +} + + +do_install () { + install -d ${D}${sysconfdir}/ipkg + install -m 0644 ${S}/${sysconfdir}/ipkg/* ${D}${sysconfdir}/ipkg/ +} + +CONFFILES_${PN} += "${sysconfdir}/ipkg/base-feed.conf \ + ${sysconfdir}/ipkg/debug-feed.conf \ + ${sysconfdir}/ipkg/perl-feed.conf \ + ${sysconfdir}/ipkg/python-feed.conf \ + ${sysconfdir}/ipkg/gstreamer-feed.conf \ + ${sysconfdir}/ipkg/${MACHINE_ARCH}-feed.conf \ + ${sysconfdir}/ipkg/noarch-feed.conf \ + " + diff --git a/packages/angstrom/angstrom-gateway-image.bb b/packages/angstrom/angstrom-gateway-image.bb index aeca221d3d..ee9d1d97fc 100644 --- a/packages/angstrom/angstrom-gateway-image.bb +++ b/packages/angstrom/angstrom-gateway-image.bb @@ -1,12 +1,10 @@ #Angstrom gateway image #gives you a gateway with SMB, ssh and dnsmasqs -LICENSE = "MIT" -PR = "r0" ANGSTROM_EXTRA_INSTALL ?= "" DISTRO_SSH_DAEMON ?= "dropbear" -RDEPENDS = "task-boot \ +IMAGE_INSTALL = "task-boot \ ${DISTRO_SSH_DAEMON} \ iptables \ samba swat \ @@ -16,8 +14,7 @@ RDEPENDS = "task-boot \ " export IMAGE_BASENAME = "gateway-image" -export IMAGE_LINGUAS = "" -export PACKAGE_INSTALL = "${RDEPENDS}" +IMAGE_LINGUAS = "" inherit image diff --git a/packages/angstrom/angstrom-gpe-task-apps.bb b/packages/angstrom/angstrom-gpe-task-apps.bb index 37a6ed98c3..0a4b1309da 100644 --- a/packages/angstrom/angstrom-gpe-task-apps.bb +++ b/packages/angstrom/angstrom-gpe-task-apps.bb @@ -1,10 +1,11 @@ DESCRIPTION = "Task packages for the Angstrom distribution" -PR = "r31" -ALLOW_EMPTY = "1" +PR = "r32" + +inherit task PACKAGE_ARCH = "${MACHINE_ARCH}" -RDEPENDS = "\ +RDEPENDS_${PN} = "\ gpe-edit \ gpe-gallery \ gpe-calculator \ diff --git a/packages/angstrom/angstrom-gpe-task-base.bb b/packages/angstrom/angstrom-gpe-task-base.bb index c931d9d1e4..265f51863d 100644 --- a/packages/angstrom/angstrom-gpe-task-base.bb +++ b/packages/angstrom/angstrom-gpe-task-base.bb @@ -1,10 +1,11 @@ DESCRIPTION = "Task packages for the Angstrom distribution" -PR = "r31" -ALLOW_EMPTY = "1" +PR = "r32" + +inherit task PACKAGE_ARCH = "${MACHINE_ARCH}" -RDEPENDS = "\ +RDEPENDS_${PN} = "\ matchbox \ matchbox-panel-hacks \ xcursor-transparent-theme \ diff --git a/packages/angstrom/angstrom-gpe-task-game.bb b/packages/angstrom/angstrom-gpe-task-game.bb index 09a47f6a26..beca89cdbc 100644 --- a/packages/angstrom/angstrom-gpe-task-game.bb +++ b/packages/angstrom/angstrom-gpe-task-game.bb @@ -1,8 +1,9 @@ DESCRIPTION = "Task packages for the Angstrom distribution" -PR = "r31" -ALLOW_EMPTY = "1" +PR = "r32" -RDEPENDS = "\ +inherit task + +RDEPENDS_${PN} = "\ gpe-go \ gpe-lights \ gpe-othello \ diff --git a/packages/angstrom/angstrom-gpe-task-pim.bb b/packages/angstrom/angstrom-gpe-task-pim.bb index 8e9d0d4f31..fc0b4109f4 100644 --- a/packages/angstrom/angstrom-gpe-task-pim.bb +++ b/packages/angstrom/angstrom-gpe-task-pim.bb @@ -1,8 +1,9 @@ DESCRIPTION = "Task packages for the Angstrom distribution" -PR = "r31" -ALLOW_EMPTY = "1" +PR = "r32" -RDEPENDS = "\ +inherit task + +RDEPENDS_${PN} = "\ gpe-timesheet \ gpe-todo \ gpe-calendar \ diff --git a/packages/angstrom/angstrom-gpe-task-settings.bb b/packages/angstrom/angstrom-gpe-task-settings.bb index c79c068cbd..a9463fdbe5 100644 --- a/packages/angstrom/angstrom-gpe-task-settings.bb +++ b/packages/angstrom/angstrom-gpe-task-settings.bb @@ -1,8 +1,9 @@ DESCRIPTION = "Task packages for the Angstrom distribution" -PR = "r31" -ALLOW_EMPTY = "1" +PR = "r32" -RDEPENDS = "\ +inherit task + +RDEPENDS_${PN} = "\ matchbox-panel-manager \ gpe-su \ gpe-conf \ diff --git a/packages/angstrom/angstrom-mokogateway-image.bb b/packages/angstrom/angstrom-mokogateway-image.bb index 624274de37..a8c59f2075 100644 --- a/packages/angstrom/angstrom-mokogateway-image.bb +++ b/packages/angstrom/angstrom-mokogateway-image.bb @@ -1,20 +1,17 @@ #Angstrom moko gateway image # tries to be a companion for openmoko based phones -LICENSE = "MIT" -PR = "r2" ANGSTROM_EXTRA_INSTALL ?= "" DEPENDS = "task-base" -RDEPENDS = " \ +IMAGE_INSTALL = " \ task-boot \ task-base-bluetooth \ bluez-utils \ blueprobe \ " export IMAGE_BASENAME = "mokogateway-image" -export IMAGE_LINGUAS = "" -export PACKAGE_INSTALL = "${RDEPENDS}" +IMAGE_LINGUAS = "" inherit image diff --git a/packages/angstrom/angstrom-ohand-task-pim.bb b/packages/angstrom/angstrom-ohand-task-pim.bb index 70d52c922f..71d0512687 100644 --- a/packages/angstrom/angstrom-ohand-task-pim.bb +++ b/packages/angstrom/angstrom-ohand-task-pim.bb @@ -1,8 +1,9 @@ DESCRIPTION = "Task packages for the Angstrom distribution" -PR = "r31" -ALLOW_EMPTY = "1" +PR = "r32" -RDEPENDS = "\ +inherit task + +RDEPENDS_${PN} = "\ dates \ contacts \ tasks \ diff --git a/packages/angstrom/angstrom-task-office.bb b/packages/angstrom/angstrom-task-office.bb index 364924995a..90b700b8c9 100644 --- a/packages/angstrom/angstrom-task-office.bb +++ b/packages/angstrom/angstrom-task-office.bb @@ -1,8 +1,9 @@ DESCRIPTION = "Task packages for the Angstrom distribution" -PR = "r31" -ALLOW_EMPTY = "1" +PR = "r32" -RDEPENDS = "\ +inherit task + +RDEPENDS_${PN} = "\ gnumeric \ abiword \ imposter \ diff --git a/packages/angstrom/angstrom-task-printing.bb b/packages/angstrom/angstrom-task-printing.bb index 2954667192..f4a833645a 100644 --- a/packages/angstrom/angstrom-task-printing.bb +++ b/packages/angstrom/angstrom-task-printing.bb @@ -1,8 +1,9 @@ DESCRIPTION = "Task packages for the Angstrom distribution" -PR = "r31" -ALLOW_EMPTY = "1" +PR = "r32" -RDEPENDS = "\ +inherit task + +RDEPENDS_${PN} = "\ cups \ # gnome-cups-manager \ " diff --git a/packages/angstrom/angstrom-task-sectest.bb b/packages/angstrom/angstrom-task-sectest.bb index 3142f280f3..c3ebcab31d 100644 --- a/packages/angstrom/angstrom-task-sectest.bb +++ b/packages/angstrom/angstrom-task-sectest.bb @@ -1,8 +1,9 @@ DESCRIPTION = "Task packages for the Angstrom distribution" -PR = "r31" -ALLOW_EMPTY = "1" +PR = "r32" -RDEPENDS = "\ +inherit task + +RDEPENDS_${PN} = "\ nmap \ ettercap \ stunnel \ diff --git a/packages/angstrom/angstrom-version.bb b/packages/angstrom/angstrom-version.bb index 2488255b53..32f3f01635 100644 --- a/packages/angstrom/angstrom-version.bb +++ b/packages/angstrom/angstrom-version.bb @@ -1,9 +1,10 @@ PV = "${DISTRO_VERSION}" +PR = "r1" PACKAGES = "${PN}" PACKAGE_ARCH = "${MACHINE_ARCH}" -do_compile() { +do_install() { mkdir -p ${D}${sysconfdir} echo "Angstrom ${DISTRO_VERSION}" > ${D}${sysconfdir}/angstrom-version diff --git a/packages/angstrom/angstrom-x11-base-depends.bb b/packages/angstrom/angstrom-x11-base-depends.bb index a2eda707f1..1561ec003d 100644 --- a/packages/angstrom/angstrom-x11-base-depends.bb +++ b/packages/angstrom/angstrom-x11-base-depends.bb @@ -1,6 +1,7 @@ DESCRIPTION = "Task packages for the Angstrom distribution" -PR = "r35" -ALLOW_EMPTY = "1" +PR = "r36" + +inherit task XSERVER ?= "xserver-kdrive-fbdev" diff --git a/packages/angstrom/angstrom-x11-gpe-image.bb b/packages/angstrom/angstrom-x11-gpe-image.bb new file mode 100644 index 0000000000..ffd401b6a8 --- /dev/null +++ b/packages/angstrom/angstrom-x11-gpe-image.bb @@ -0,0 +1,26 @@ +#Angstrom X11 image, with apps and kernel modules included + +ANGSTROM_EXTRA_INSTALL += " \ + ${@base_contains("MACHINE_FEATURES", "phone", "openmoko-dialer2", "",d)} \ + " +XSERVER ?= "xserver-kdrive-fbdev" + +export IMAGE_BASENAME = "x11-gpe-image" + +DEPENDS = "task-base" +IMAGE_INSTALL = "\ + ${XSERVER} \ + task-base-extended \ + angstrom-x11-base-depends \ + angstrom-gpe-task-base \ + angstrom-gpe-task-settings \ + kernel-modules \ + hal \ + angstrom-gpe-task-pim \ + ${ANGSTROM_EXTRA_INSTALL}" + + +#zap root password for release images +ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}' + +inherit image diff --git a/packages/angstrom/angstrom-x11-image.bb b/packages/angstrom/angstrom-x11-image.bb index 83f00cce66..e430590a7f 100644 --- a/packages/angstrom/angstrom-x11-image.bb +++ b/packages/angstrom/angstrom-x11-image.bb @@ -1,12 +1,4 @@ #Angstrom X11 image -LICENSE = "MIT" -PR = "r11" - -PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget" -PREFERRED_PROVIDER_tslib ?= "tslib" -PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11" -PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11" -PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" ANGSTROM_EXTRA_INSTALL += " \ ${@base_contains("MACHINE_FEATURES", "phone", "openmoko-dialer2", "",d)} \ @@ -16,7 +8,7 @@ XSERVER ?= "xserver-kdrive-fbdev" export IMAGE_BASENAME = "x11-image" DEPENDS = "task-base" -RDEPENDS = "\ +IMAGE_INSTALL = "\ ${XSERVER} \ task-base-extended \ angstrom-x11-base-depends \ @@ -24,9 +16,6 @@ RDEPENDS = "\ angstrom-gpe-task-settings \ ${ANGSTROM_EXTRA_INSTALL}" - -export PACKAGE_INSTALL = "${RDEPENDS}" - #zap root password for release images ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}' diff --git a/packages/angstrom/angstrom-x11-office-image.bb b/packages/angstrom/angstrom-x11-office-image.bb new file mode 100644 index 0000000000..f9dcb8cf43 --- /dev/null +++ b/packages/angstrom/angstrom-x11-office-image.bb @@ -0,0 +1,30 @@ +#Angstrom X11 image, with apps and kernel modules included + +ANGSTROM_EXTRA_INSTALL += " \ + ${@base_contains("MACHINE_FEATURES", "phone", "openmoko-dialer2", "",d)} \ + " +XSERVER ?= "xserver-kdrive-fbdev" + +export IMAGE_BASENAME = "x11-office-image" + +DEPENDS = "task-base" +IMAGE_INSTALL = "\ + ${XSERVER} \ + task-base-extended \ + angstrom-x11-base-depends \ + angstrom-gpe-task-base \ + angstrom-gpe-task-settings \ + kernel-modules \ + hal \ + abiword \ + gnumeric \ + cups \ + claws-mail claws-mail claws-plugin-maildir claws-plugin-mailmbox claws-plugin-rssyl \ + midori minimo \ + gphoto2 \ + ${ANGSTROM_EXTRA_INSTALL}" + +#zap root password for release images +ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}' + +inherit image diff --git a/packages/angstrom/angstrom-x11-pimlico-image.bb b/packages/angstrom/angstrom-x11-pimlico-image.bb new file mode 100644 index 0000000000..c7acedfa0d --- /dev/null +++ b/packages/angstrom/angstrom-x11-pimlico-image.bb @@ -0,0 +1,26 @@ +#Angstrom X11 image, with apps and kernel modules included + +ANGSTROM_EXTRA_INSTALL += " \ + ${@base_contains("MACHINE_FEATURES", "phone", "openmoko-dialer2", "",d)} \ + " +XSERVER ?= "xserver-kdrive-fbdev" + +export IMAGE_BASENAME = "x11-pimlico-image" + +DEPENDS = "task-base" +IMAGE_INSTALL = "\ + ${XSERVER} \ + task-base-extended \ + angstrom-x11-base-depends \ + angstrom-gpe-task-base \ + angstrom-gpe-task-settings \ + kernel-modules \ + hal \ + angstrom-ohand-task-pim \ + ${ANGSTROM_EXTRA_INSTALL}" + + +#zap root password for release images +ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}' + +inherit image |