diff options
Diffstat (limited to 'packages')
51 files changed, 93 insertions, 310 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-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-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-x11-gpe-image.bb b/packages/angstrom/angstrom-x11-gpe-image.bb index 6d9e7b296c..59ef3b95ba 100644 --- a/packages/angstrom/angstrom-x11-gpe-image.bb +++ b/packages/angstrom/angstrom-x11-gpe-image.bb @@ -1,6 +1,4 @@ #Angstrom X11 image, with apps and kernel modules included -LICENSE = "MIT" -PR = "r0" PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget" PREFERRED_PROVIDER_tslib ?= "tslib" @@ -16,7 +14,7 @@ XSERVER ?= "xserver-kdrive-fbdev" export IMAGE_BASENAME = "x11-gpe-image" DEPENDS = "task-base" -RDEPENDS = "\ +IMAGE_INSTALL = "\ ${XSERVER} \ task-base-extended \ angstrom-x11-base-depends \ @@ -28,8 +26,6 @@ RDEPENDS = "\ ${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-image.bb b/packages/angstrom/angstrom-x11-image.bb index 83f00cce66..4446c52a8d 100644 --- a/packages/angstrom/angstrom-x11-image.bb +++ b/packages/angstrom/angstrom-x11-image.bb @@ -1,6 +1,4 @@ #Angstrom X11 image -LICENSE = "MIT" -PR = "r11" PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget" PREFERRED_PROVIDER_tslib ?= "tslib" @@ -16,7 +14,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 +22,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 index 8cb6e7a839..e2c6167604 100644 --- a/packages/angstrom/angstrom-x11-office-image.bb +++ b/packages/angstrom/angstrom-x11-office-image.bb @@ -1,6 +1,4 @@ #Angstrom X11 image, with apps and kernel modules included -LICENSE = "MIT" -PR = "r1" PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget" PREFERRED_PROVIDER_tslib ?= "tslib" @@ -16,7 +14,7 @@ XSERVER ?= "xserver-kdrive-fbdev" export IMAGE_BASENAME = "x11-office-image" DEPENDS = "task-base" -RDEPENDS = "\ +IMAGE_INSTALL = "\ ${XSERVER} \ task-base-extended \ angstrom-x11-base-depends \ @@ -32,9 +30,6 @@ RDEPENDS = "\ gphoto2 \ ${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-pimlico-image.bb b/packages/angstrom/angstrom-x11-pimlico-image.bb index 0f6782e007..1b40227347 100644 --- a/packages/angstrom/angstrom-x11-pimlico-image.bb +++ b/packages/angstrom/angstrom-x11-pimlico-image.bb @@ -1,6 +1,4 @@ #Angstrom X11 image, with apps and kernel modules included -LICENSE = "MIT" -PR = "r0" PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget" PREFERRED_PROVIDER_tslib ?= "tslib" @@ -16,7 +14,7 @@ XSERVER ?= "xserver-kdrive-fbdev" export IMAGE_BASENAME = "x11-pimlico-image" DEPENDS = "task-base" -RDEPENDS = "\ +IMAGE_INSTALL = "\ ${XSERVER} \ task-base-extended \ angstrom-x11-base-depends \ @@ -28,8 +26,6 @@ RDEPENDS = "\ ${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/images/angstrom-minimal-image.bb b/packages/images/angstrom-minimal-image.bb index e10954838c..4b3a4cd835 100644 --- a/packages/images/angstrom-minimal-image.bb +++ b/packages/images/angstrom-minimal-image.bb @@ -1,21 +1,17 @@ #Angstrom minimalist image #gives you a small images with ssh access -LICENSE = "MIT" -PR = "r3" ANGSTROM_EXTRA_INSTALL ?= "" DISTRO_SSH_DAEMON ?= "dropbear" -IMAGE_LINGUAS = " " -RDEPENDS = "task-boot \ +IMAGE_INSTALL = "task-boot \ util-linux-mount util-linux-umount \ ${DISTRO_SSH_DAEMON} \ angstrom-version \ " export IMAGE_BASENAME = "minimalist-image" -export IMAGE_LINGUAS = "" -export PACKAGE_INSTALL = "${RDEPENDS}" +IMAGE_LINGUAS = "" inherit image diff --git a/packages/images/bootstrap-image-bootchart.bb b/packages/images/bootstrap-image-bootchart.bb index dea254eaa5..fafd734229 100644 --- a/packages/images/bootstrap-image-bootchart.bb +++ b/packages/images/bootstrap-image-bootchart.bb @@ -1,10 +1,7 @@ -export IMAGE_BASENAME = "bootstrap-image-bootchart" -export IMAGE_LINGUAS = "" -export PACKAGE_INSTALL = "${MACHINE_TASK_PROVIDER} bootchart acct" - DEPENDS = "${MACHINE_TASK_PROVIDER} bootchart" -RDEPENDS = "acct" + +IMAGE_LINGUAS = "" +IMAGE_INSTALL = "${MACHINE_TASK_PROVIDER} bootchart acct" inherit image -LICENSE = "MIT" diff --git a/packages/images/bootstrap-image.bb b/packages/images/bootstrap-image.bb index f25ad222aa..64577c4048 100644 --- a/packages/images/bootstrap-image.bb +++ b/packages/images/bootstrap-image.bb @@ -1,9 +1,7 @@ -export IMAGE_BASENAME = "bootstrap-image" -export IMAGE_LINGUAS = "" -export PACKAGE_INSTALL = "${MACHINE_TASK_PROVIDER}" - DEPENDS = "${MACHINE_TASK_PROVIDER}" +IMAGE_LINGUAS = "" +IMAGE_INSTALL = "${MACHINE_TASK_PROVIDER}" + inherit image -LICENSE = "MIT" diff --git a/packages/images/devimage-image.bb b/packages/images/devimage-image.bb index e8177433be..6a3e60c5e3 100644 --- a/packages/images/devimage-image.bb +++ b/packages/images/devimage-image.bb @@ -2,19 +2,15 @@ # It includes all useful "kernel userspace" utilities, but # only shell and dropbear are loaded by default. # Allows to login via serial and real console or SSH -LICENSE = "MIT" -PR = "r2.2" DEVIMAGE_EXTRA_RDEPENDS ?= "" -RDEPENDS = "devimage busybox dropbear udev \ +IMAGE_INSTALL = "devimage busybox dropbear udev \ module-init-tools pcmciautils \ wireless-tools wpa-supplicant \ irda-utils acx-firmware \ ${DEVIMAGE_EXTRA_RDEPENDS}" export IMAGE_BASENAME = "devimage" -export IMAGE_LINGUAS = "" - -PACKAGE_INSTALL = "${RDEPENDS}" +IMAGE_LINGUAS = "" inherit image diff --git a/packages/images/dvb-image.bb b/packages/images/dvb-image.bb index c4636b12aa..687c3093fa 100644 --- a/packages/images/dvb-image.bb +++ b/packages/images/dvb-image.bb @@ -1,11 +1,7 @@ -export IMAGE_BASENAME = "dvb-image" - -IMAGE_LINGUAS = "" - +DEPENDS = "${DVB_PACKAGES}" DVB_PACKAGES = "${MACHINE_TASK_PROVIDER} task-dvb" -export PACKAGE_INSTALL = "${DVB_PACKAGES}" -DEPENDS = "${DVB_PACKAGES}" +IMAGE_INSTALL = "${DVB_PACKAGES}" +IMAGE_LINGUAS = "" inherit image -LICENSE = "MIT" diff --git a/packages/images/e-image-core.bb b/packages/images/e-image-core.bb index c713437361..3ee3932c1e 100644 --- a/packages/images/e-image-core.bb +++ b/packages/images/e-image-core.bb @@ -1,9 +1,4 @@ DESCRIPTION = "An X11-based distribution with the Enlightenment Window Manager" -LICENSE = "MIT" -PR = "r1" - -export IMAGE_BASENAME = "e-image-core" -export IMAGE_LINGUAS = "" DEPENDS = "${MACHINE_TASK_PROVIDER} \ xserver-kdrive \ @@ -16,6 +11,7 @@ PREFERRED_PROVIDER_virtual/imlib2 = "imlib2-x11" PREFERRED_PROVIDER_virtual/libxine = "libxine-x11" PREFERRED_PROVIDER_libx11 = "libx11" -export PACKAGE_INSTALL = "${MACHINE_TASK_PROVIDER} task-e-x11-core xserver-kdrive-fbdev glibc-charmap-utf-8 glibc-localedata-i18n" +IMAGE_INSTALL = "${MACHINE_TASK_PROVIDER} task-e-x11-core xserver-kdrive-fbdev glibc-charmap-utf-8 glibc-localedata-i18n" +IMAGE_LINGUAS = "" inherit image diff --git a/packages/images/e-image.bb b/packages/images/e-image.bb index acd45cd5ae..600b01d37b 100644 --- a/packages/images/e-image.bb +++ b/packages/images/e-image.bb @@ -1,9 +1,10 @@ require e-image-core.bb DESCRIPTION = "An X11-based distribution with the Enlightenment Window Manager and Tools" -PR = "r6" -export IMAGE_BASENAME = "e-image" -export PACKAGE_INSTALL += "task-e-x11-core \ +DEPENDS += "task-e-x11-core task-gpe-base task-gpe-pim task-gpe-settings task-gpe-apps task-gpe-connectivity task-gpe-games \ + figment xhost gpe-soundserver gpe-confd xauth" + +IMAGE_INSTALL += "task-e-x11-core \ ask-gpe-pim \ task-gpe-settings \ task-gpe-apps \ @@ -23,8 +24,3 @@ export PACKAGE_INSTALL += "task-e-x11-core \ gdk-pixbuf-loader-pnm \ gdk-pixbuf-loader-xbm \ gdk-pixbuf-loader-xpm" - -DEPENDS += "task-e-x11-core task-gpe-base task-gpe-pim task-gpe-settings task-gpe-apps task-gpe-connectivity task-gpe-games \ - figment xhost gpe-soundserver gpe-confd xauth" - -RDEPENDS = "${PACKAGE_INSTALL}" diff --git a/packages/images/essential-image.bb b/packages/images/essential-image.bb index 21078790b7..8b566af6ec 100644 --- a/packages/images/essential-image.bb +++ b/packages/images/essential-image.bb @@ -5,24 +5,11 @@ # Filename: essential-image.bb # Date: 23-Apr-06 -DESCRIPTION = "<description>" HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml" -###################################################################################### - -PV = "0.0.1" -PR = "r0" - -###################################################################################### - -inherit image - -###################################################################################### - DEPENDS = "task-essential-to-boot" +IMAGE_LINGUAS = "" +IMAGE_INSTALL = "task-essential-to-boot" -###################################################################################### +inherit image -export IMAGE_BASENAME = "essential-image" -export IMAGE_LINGUAS = "" -export PACKAGE_INSTALL = "task-essential-to-boot" diff --git a/packages/images/essential-machine-image.bb b/packages/images/essential-machine-image.bb index f82f1833dc..b74dec5e35 100644 --- a/packages/images/essential-machine-image.bb +++ b/packages/images/essential-machine-image.bb @@ -8,29 +8,16 @@ DESCRIPTION = "<description>" HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml" -###################################################################################### - -PV = "0.0.1" -PR = "r0" - -###################################################################################### - -inherit image - -###################################################################################### - DEPENDS = "task-essential-to-boot task-essential-parts" -###################################################################################### - MACHINE_TASKS_akita = "task-essential-to-boot \ task-essential-pcmcia task-essential-userspace \ task-essential-usbhost task-essential-usbclient \ task-essential-sound task-essential-irda \ task-essential-sd" -###################################################################################### - +IMAGE_LINGUAS = "" +IMAGE_INSTALL = "${MACHINE_TASKS}" export IMAGE_BASENAME = "essential-image" -export IMAGE_LINGUAS = "" -export PACKAGE_INSTALL = "${MACHINE_TASKS}" + +inherit image
\ No newline at end of file diff --git a/packages/images/gpe-image-blank-user.bb b/packages/images/gpe-image-blank-user.bb index d092d3c44a..d9ed7fcedb 100644 --- a/packages/images/gpe-image-blank-user.bb +++ b/packages/images/gpe-image-blank-user.bb @@ -1,8 +1,3 @@ require gpe-image.bb - -PR = "r5" - -export IMAGE_BASENAME = "gpe-image-blank-user" - ROOTFS_POSTPROCESS_COMMAND += "adduser -D user" diff --git a/packages/images/gpe-image.bb b/packages/images/gpe-image.bb index aa851cf68f..8cbe8a8571 100644 --- a/packages/images/gpe-image.bb +++ b/packages/images/gpe-image.bb @@ -1,8 +1,3 @@ - -PR = "r22" - -export IMAGE_BASENAME = "gpe-image" - GPE_EXTRA_THEMES = "gpe-theme-industrial" GPE_EXTRA_INSTALL_none = "" @@ -31,9 +26,7 @@ DEPENDS = "${MACHINE_TASK_PROVIDER} \ task-gpe-games \ virtual/xserver" -RDEPENDS = "${PACKAGE_INSTALL}" - -export PACKAGE_INSTALL = "\ +IMAGE_INSTALL = "\ ${MACHINE_TASK_PROVIDER} \ task-gpe-base \ task-gpe-pim \ @@ -45,4 +38,3 @@ export PACKAGE_INSTALL = "\ #ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; " inherit image -LICENSE = "MIT" diff --git a/packages/images/gpephone-image-vm.bb b/packages/images/gpephone-image-vm.bb index a058361f27..1a9d48d22a 100644 --- a/packages/images/gpephone-image-vm.bb +++ b/packages/images/gpephone-image-vm.bb @@ -1,7 +1,3 @@ -PR = "r0" - -export IMAGE_BASENAME = "gpephone-image-vm" - GPE_EXTRA_THEMES = "" GPE_EXTRA_INSTALL_none = "" @@ -21,9 +17,8 @@ GPE_EXTRA_INSTALL += "${GPE_BIGFLASH_INSTALL}" XSERVER ?= "xserver-kdrive-fbdev" DEPENDS = "${MACHINE_TASK_PROVIDER} task-gpephone" -RDEPENDS = "${PACKAGE_INSTALL}" -export PACKAGE_INSTALL = "\ +IMAGE_INSTALL = "\ ${MACHINE_TASK_PROVIDER} \ gpephone-task-base \ gpephone-task-pim \ @@ -37,6 +32,3 @@ export PACKAGE_INSTALL = "\ inherit image ROOTFS_POSTPROCESS_COMMAND += "set_image_autologin; " - - -LICENSE = "MIT" diff --git a/packages/images/gpephone-image.bb b/packages/images/gpephone-image.bb index 21496cae55..bfe9238e3e 100644 --- a/packages/images/gpephone-image.bb +++ b/packages/images/gpephone-image.bb @@ -1,7 +1,3 @@ -PR = "r1" - -export IMAGE_BASENAME = "gpephone-image" - GPE_EXTRA_THEMES = "" GPE_EXTRA_INSTALL_none = "" @@ -21,9 +17,8 @@ GPE_EXTRA_INSTALL += "${GPE_BIGFLASH_INSTALL}" XSERVER ?= "xserver-kdrive-fbdev" DEPENDS = "${MACHINE_TASK_PROVIDER} task-gpephone virtual/xserver" -RDEPENDS = "${PACKAGE_INSTALL}" -export PACKAGE_INSTALL = "\ +IMAGE_INSTALL = "\ ${MACHINE_TASK_PROVIDER} \ gpephone-task-base \ gpephone-task-pim \ diff --git a/packages/images/helloworld-image.bb b/packages/images/helloworld-image.bb index a1caf54cc5..cebfc33acd 100644 --- a/packages/images/helloworld-image.bb +++ b/packages/images/helloworld-image.bb @@ -1,13 +1,7 @@ # Hello world image # Contains *only* a statically linked hello world init program -LICENSE = "MIT" -PR = "r0" -RDEPENDS = "helloworld" - -export IMAGE_BASENAME = "helloworld-image" -export IMAGE_LINGUAS = "" - -PACKAGE_INSTALL = ${RDEPENDS} +IMAGE_INSTALL = "helloworld" +IMAGE_LINGUAS = "" inherit image diff --git a/packages/images/initramfs-image.bb b/packages/images/initramfs-image.bb index 95e3f84082..3103b9f765 100644 --- a/packages/images/initramfs-image.bb +++ b/packages/images/initramfs-image.bb @@ -1,13 +1,7 @@ # Sample initramfs image -LICENSE = "MIT" -PR = "r2" -RDEPENDS = "initramfs-module-block initramfs-module-loop initramfs-module-nfs" - -export IMAGE_BASENAME = "initramfs-image" -export IMAGE_LINGUAS = "" - -PACKAGE_INSTALL = "${RDEPENDS}" +IMAGE_INSTALL = "initramfs-module-block initramfs-module-loop initramfs-module-nfs" +IMAGE_LINGUAS = "" # Remove any kernel-image that the kernel-module-* packages may have pulled in. PACKAGE_REMOVE = "kernel-image-* update-modules" diff --git a/packages/images/initramfs-minimal-image.bb b/packages/images/initramfs-minimal-image.bb index 1b60405e74..1aa928b2a9 100644 --- a/packages/images/initramfs-minimal-image.bb +++ b/packages/images/initramfs-minimal-image.bb @@ -1,15 +1,12 @@ # Sample initramfs image -LICENSE = "MIT" -PR = "r0" -#RDEPENDS = "initramfs-boot busybox kernel-module-uinput uclibc libgcc1" -RDEPENDS = "initramfs-nfsboot busybox-static kernel-module-uinput" +#IMAGE_INSTALL = "initramfs-boot busybox kernel-module-uinput uclibc libgcc1" +IMAGE_INSTALL = "initramfs-nfsboot busybox-static kernel-module-uinput" export IMAGE_BASENAME = "initramfs-image" -export IMAGE_LINGUAS = "" +IMAGE_LINGUAS = "" -PACKAGE_INSTALL = "${RDEPENDS}" -# Install only ${PACKAGE_INSTALL}, not even deps +# Install only ${IMAGE_INSTALL}, not even deps PACKAGE_INSTALL_NO_DEPS = "1" inherit image diff --git a/packages/images/jlime-opie.bb b/packages/images/jlime-opie.bb index a6f8b7989a..7d98f98a32 100644 --- a/packages/images/jlime-opie.bb +++ b/packages/images/jlime-opie.bb @@ -1,15 +1,10 @@ -export IMAGE_BASENAME = "jlime-opie" -export IMAGE_LINGUAS = "" - -LICENSE = "MIT" -PR = "r21" +IMAGE_LINGUAS = "" DEPENDS = "task-bootstrap task-opie" -RDEPENDS = "${INSTALL_PACKAGES}" -extra_stuff := '${@base_conditional("ROOT_FLASH_ |