diff options
Diffstat (limited to 'packages/images')
42 files changed, 81 insertions, 261 deletions
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_SIZE", "24", "", "task-opie-extra-games task-opie-extra-apps task-opie-extra-styles konqueror-embedded",d)}' +extra_stuff = '${@base_conditional("ROOT_FLASH_SIZE", "24", "", "task-opie-extra-games task-opie-extra-apps task-opie-extra-styles konqueror-embedded",d)}' -INSTALL_PACKAGES = "task-bootstrap task-opie-base task-opie-base-applets \ +IMAGE_INSTALL = "task-bootstrap task-opie-base task-opie-base-applets \ task-opie-base-inputmethods task-opie-base-apps \ task-opie-base-settings task-opie-base-decorations \ task-opie-base-styles task-opie-base-pim \ @@ -17,8 +12,6 @@ INSTALL_PACKAGES = "task-bootstrap task-opie-base task-opie-base-applets \ task-opie-bluetooth task-opie-irda \ ${extra_stuff}" -export PACKAGE_INSTALL = "${INSTALL_PACKAGES}" - # merge feed-sources into ipkg.conf for opie-aqpkg as it can't handle feed-sources outside of ipkg.conf. merge_feeds() { diff --git a/packages/images/maemo-image.bb b/packages/images/maemo-image.bb index f8f5cb5c9d..c0498bb910 100644 --- a/packages/images/maemo-image.bb +++ b/packages/images/maemo-image.bb @@ -2,10 +2,6 @@ # Meta package for maemo based system image # -PR = "r2" - -export IMAGE_BASENAME = "maemo-image" - GUI_MACHINE_CLASS ?= "none" MAEMO_EXTRA_DEPENDS = "scap dosfstools" @@ -17,9 +13,8 @@ DEPENDS = "${MACHINE_TASK_PROVIDER} \ meta-maemo \ ${MAEMO_EXTRA_DEPENDS}" -export PACKAGE_INSTALL = "${MACHINE_TASK_PROVIDER} maemo-task-base maemo-task-theme \ +IMAGE_INSTALL = "${MACHINE_TASK_PROVIDER} maemo-task-base maemo-task-theme \ maemo-task-apps ${MAEMO_EXTRA_INSTALL} \ ${XSERVER}" inherit image -LICENSE = "MIT" diff --git a/packages/images/mythfront-image.bb b/packages/images/mythfront-image.bb index 49e6b5ae2b..8ba6779fdc 100644 --- a/packages/images/mythfront-image.bb +++ b/packages/images/mythfront-image.bb @@ -1,13 +1,10 @@ -export IMAGE_BASENAME = "mythfront-image" - IMAGE_ROOTFS_SIZE_ext2 = "85000" IMAGE_ROOTFS_SIZE_ext2.gz = "85000" IMAGE_LINGUAS = "" MYTHFRONT_PACKAGES = "${MACHINE_TASK_PROVIDER} task-mythfront" -export PACKAGE_INSTALL = "${MYTHFRONT_PACKAGES}" DEPENDS = "${MYTHFRONT_PACKAGES}" +IMAGE_INSTALL = "${MYTHFRONT_PACKAGES}" inherit image -LICENSE = "MIT" diff --git a/packages/images/nslu2-linksys-image.bb b/packages/images/nslu2-linksys-image.bb index 7cfad432a3..312d3b144e 100644 --- a/packages/images/nslu2-linksys-image.bb +++ b/packages/images/nslu2-linksys-image.bb @@ -1,14 +1,11 @@ IMAGE_LINGUAS = "" USE_DEVFS = "1" -IMAGE_BASENAME = "nslu2-linksys" - -PACKAGE_INSTALL = "nslu2-linksys-ramdisk" - -DEPENDS = "nslu2-linksys-kernel ${PACKAGE_INSTALL}" +DEPENDS = "nslu2-linksys-kernel" +export IMAGE_BASENAME = "nslu2-linksys" +IMAGE_INSTALL = "nslu2-linksys-ramdisk" NSLU2_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-nslu2.txt')}" EXTRA_IMAGECMD_ext2.gz = "-f ${NSLU2_DEVICE_TABLE}" inherit image -LICENSE = "MIT" diff --git a/packages/images/nylon-image-base.bb b/packages/images/nylon-image-base.bb index 8cd71194b4..b4913097be 100644 --- a/packages/images/nylon-image-base.bb +++ b/packages/images/nylon-image-base.bb @@ -1,6 +1,5 @@ inherit image inherit nylon-image -LICENSE = "MIT" export IMAGE_BASENAME = "nylon-base" @@ -12,7 +11,7 @@ NYLON_BASE = "base-files base-passwd bash busybox \ timezones tinylogin udev" DEPENDS += "virtual/kernel less nano" -RDEPENDS = "kernel less nano elvis-tiny \ +IMAGE_INSTALL = "kernel less nano elvis-tiny \ ${NYLON_BASE} ${BOOTSTRAP_EXTRA_RDEPENDS}" ## kernel 2.4 ## @@ -22,11 +21,8 @@ RDEPENDS_append_mtx-2 = " modutils modutils-initscripts modutils-depmod modutils RDEPENDS_append_mtx-3 = " module-init-tools udev" RDEPENDS_append_mtx-3a = " module-init-tools" -export PACKAGE_INSTALL = "${RDEPENDS}" - IMAGE_LINGUAS = "" # we dont need the kernel in the image ROOTFS_POSTPROCESS_COMMAND = "rm -f ${IMAGE_ROOTFS}/tmp/*Image*" # needed?? the above line is the same as in classes/nylon-image.bbclass - diff --git a/packages/images/nylon-image-extended.bb b/packages/images/nylon-image-extended.bb index 9b92dfdbb7..7a4e5b6c88 100644 --- a/packages/images/nylon-image-extended.bb +++ b/packages/images/nylon-image-extended.bb @@ -75,10 +75,10 @@ KERNEL_MODULES = " \ DEPENDS += "${NYLON_EXTENDED_DEPENDS}" -RDEPENDS += "${NYLON_EXTENDED_DEPENDS} ${KERNEL_MODULES} \ +IMAGE_INSTALL += "${NYLON_EXTENDED_DEPENDS} ${KERNEL_MODULES} \ ${NYLON_EXTENDED_RDEPENDS} elvis-tools" -RDEPENDS_append_mtx-1 = "\ +IMAGE_INSTALL_append_mtx-1 = "\ kernel-module-au1x00-bi \ kernel-module-network-fd \ kernel-module-usbdcore" diff --git a/packages/images/nylon-image-extra.bb b/packages/images/nylon-image-extra.bb index a07ae82ab0..e943a98fc0 100644 --- a/packages/images/nylon-image-extra.bb +++ b/packages/images/nylon-image-extra.bb @@ -2,7 +2,7 @@ require nylon-image-standard.bb export IMAGE_BASENAME = "nylon-extra" -RDEPENDS = "\ +IMAGE_INSTALL = "\ kismet \ netperf \ nylon-statistics \ diff --git a/packages/images/nylon-image-mini.bb b/packages/images/nylon-image-mini.bb index c0ed998449..f011cb171c 100644 --- a/packages/images/nylon-image-mini.bb +++ b/packages/images/nylon-image-mini.bb @@ -1,7 +1,6 @@ export IMAGE_BASENAME = "nylon-mini" inherit image -LICENSE = "MIT" NYLON_BASE = "base-files base-passwd busybox \ dropbear \ @@ -11,9 +10,5 @@ NYLON_BASE = "base-files base-passwd busybox \ netbase \ wireless-tools" -RDEPENDS += "kernel \ - ${NYLON_BASE} ${BOOTSTRAP_EXTRA_RDEPENDS}" - -export PACKAGE_INSTALL = "${RDEPENDS}" - +IMAGE_INSTALL += "kernel ${NYLON_BASE} ${BOOTSTRAP_EXTRA_RDEPENDS}" IMAGE_LINGUAS = "" diff --git a/packages/images/nylon-image-standard.bb b/packages/images/nylon-image-standard.bb index ca5f987dfe..5f79402c99 100644 --- a/packages/images/nylon-image-standard.bb +++ b/packages/images/nylon-image-standard.bb @@ -16,5 +16,5 @@ NYLON_STANDARD = "\ DEPENDS += "hostap-modules ntp \ ${NYLON_STANDARD}" -RDEPENDS += "hostap-modules-pci ntpdate less nano elvis-tiny \ +IMAGE_INSTALL += "hostap-modules-pci ntpdate less nano elvis-tiny \ ${NYLON_STANDARD}" diff --git a/packages/images/openmoko-devel-image.bb b/packages/images/openmoko-devel-image.bb index 9c72533f8d..4aec237977 100644 --- a/packages/images/openmoko-devel-image.bb +++ b/packages/images/openmoko-devel-image.bb @@ -1,5 +1,3 @@ require openmoko-image.bb -export PACKAGE_INSTALL += "\ - task-openmoko-debug \ -" +IMAGE_INSTALL += "task-openmoko-debug"
\ No newline at end of file diff --git a/packages/images/openmoko-image.bb b/packages/images/openmoko-image.bb index 0dfd2166f0..1e8b36318c 100644 --- a/packages/images/openmoko-image.bb +++ b/packages/images/openmoko-image.bb @@ -2,10 +2,9 @@ # OpenMoko Image Recipe #------------------------------------------------------ -export IMAGE_BASENAME = "${PN}" -export IMAGE_LINGUAS = "" +IMAGE_LINGUAS = "" -export PACKAGE_INSTALL = "\ +IMAGE_INSTALL = "\ ${MACHINE_TASK_PROVIDER} \ task-openmoko-linux \ task-openmoko-net \ @@ -21,10 +20,7 @@ DEPENDS = "\ task-openmoko \ " -RDEPENDS = "${PACKAGE_INSTALL}" inherit image -LICENSE = MIT - ROOTFS_POSTPROCESS_COMMAND += 'date "+%m%d%H%M%Y" >${IMAGE_ROOTFS}/etc/timestamp' diff --git a/packages/images/openmoko-sdk-image.bb b/packages/images/openmoko-sdk-image.bb index 53586166eb..85958085ae 100644 --- a/packages/images/openmoko-sdk-image.bb +++ b/packages/images/openmoko-sdk-image.bb @@ -1,5 +1,3 @@ require openmoko-devel-image.bb -export PACKAGE_INSTALL += "\ - task-openmoko-native-sdk \ -" +IMAGE_INSTALL += "task-openmoko-native-sdk" diff --git a/packages/images/openprotium-image.bb b/packages/images/openprotium-image.bb index 25d38cf1c3..818fd0b186 100644 --- a/packages/images/openprotium-image.bb +++ b/packages/images/openprotium-image.bb @@ -1,7 +1,5 @@ DESCRIPTION = "OpenProtium image" HOMEPAGE = "http://www.openprotium.com" -LICENSE = "MIT" -PR = "r0" DEPENDS = "${MACHINE_TASK_PROVIDER}" EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x10000 -D ${SLUGOS_DEVICE_TABLE}" @@ -79,7 +77,7 @@ SLUGOS_KERNEL ?= "kernel-module-af-packet kernel-module-netconsole \ OPENPROTIUM_KERNEL = "kernel-module-dummy \ kernel-module-af-packet " -RDEPENDS = " \ +IMAGE_INSTALL = " \ kernel base-files base-passwd netbase \ busybox initscripts-openprotium openprotium-init \ update-modules sysvinit tinylogin \ @@ -96,8 +94,6 @@ RDEPENDS = " \ ${OPENPROTIUM_KERNEL} " # ${SLUGOS_EXTRA_RDEPENDS}" -PACKAGE_INSTALL = "${RDEPENDS}" - inherit image storcenter_pack_image() { diff --git a/packages/images/opie-image-16mb.bb b/packages/images/opie-image-16mb.bb index 9c0ed1cacc..06bcdad7e8 100644 --- a/packages/images/opie-image-16mb.bb +++ b/packages/images/opie-image-16mb.bb @@ -1,13 +1,8 @@ -export IMAGE_BASENAME = "opie-image-16mb" -export IMAGE_LINGUAS = "" - -LICENSE = "MIT" -PR = "r1" +IMAGE_LINGUAS = "" DEPENDS = "${MACHINE_TASK_PROVIDER} task-opie-16mb" -RDEPENDS = "${INSTALL_PACKAGES}" -INSTALL_PACKAGES = "task-boot \ +IMAGE_INSTALL = "task-boot \ ipkg ipkg-collateral \ dropbear \ task-opie-16mb-base \ @@ -18,8 +13,6 @@ INSTALL_PACKAGES = "task-boot \ task-opie-16mb-pim \ task-opie-irda" -export PACKAGE_INSTALL = "${INSTALL_PACKAGES}" - # merge feed-sources into ipkg.conf for opie-aqpkg as it can't handle feed-sources outside of ipkg.conf. merge_feeds() { diff --git a/packages/images/opie-image.bb b/packages/images/opie-image.bb index cd8d7df654..1f1130204a 100644 --- a/packages/images/opie-image.bb +++ b/packages/images/opie-image.bb @@ -1,21 +1,14 @@ -export IMAGE_BASENAME = "opie-image" -export IMAGE_LINGUAS = "" - -LICENSE = "MIT" -PR = "r22" +IMAGE_LINGUAS = "" DEPENDS = "${MACHINE_TASK_PROVIDER} task-opie" -RDEPENDS = "${INSTALL_PACKAGES}" -INSTALL_PACKAGES = "${MACHINE_TASK_PROVIDER} task-opie-base task-opie-base-applets \ +IMAGE_INSTALL = "${MACHINE_TASK_PROVIDER} task-opie-base task-opie-base-applets \ task-opie-base-inputmethods task-opie-base-apps \ task-opie-base-settings task-opie-base-decorations \ task-opie-base-styles task-opie-base-pim \ task-opie-extra-settings \ task-opie-bluetooth task-opie-irda " -export PACKAGE_INSTALL = "${INSTALL_PACKAGES}" - # merge feed-sources into ipkg.conf for opie-aqpkg as it can't handle feed-sources outside of ipkg.conf. merge_feeds() { diff --git a/packages/images/opie-kdepim-image.bb b/packages/images/opie-kdepim-image.bb index 477d924c2c..a8cb28bf27 100644 --- a/packages/images/opie-kdepim-image.bb +++ b/packages/images/opie-kdepim-image.bb @@ -1,10 +1,7 @@ require opie-image.bb DEPENDS += "kdepimpi" -PR = "r1" export IMAGE_BASENAME = "opie-kdepim-image" -INSTALL_PACKAGES += "kopi kapi kammu kopi-applet" - -export PACKAGE_INSTALL = "${INSTALL_PACKAGES}" +IMAGE_INSTALL += "kopi kapi kammu kopi-applet" diff --git a/packages/images/ossie-image.bb b/packages/images/ossie-image.bb index 7f7cfbd2e0..aedbecbefd 100644 --- a/packages/images/ossie-image.bb +++ b/packages/images/ossie-image.bb @@ -1,9 +1,8 @@ -export IMAGE_BASENAME = "ossie-image" -export IMAGE_LINGUAS = "" -export PACKAGE_INSTALL = "${MACHINE_TASK_PROVIDER} task-ossie" - DEPENDS = "${MACHINE_TASK_PROVIDER} task-ossie" +IMAGE_LINGUAS = "" +IMAGE_INSTALL = "${MACHINE_TASK_PROVIDER} task-ossie" + OSSIE_URI = "http://192.168.1.81/feed" FEED_URIS += " \ @@ -13,7 +12,4 @@ FEED_URIS += " \ debug##${OSSIE_URI}/unstable/feed/${TARGET_ARCH}/debug \ ${MACHINE}##${OSSIE_URI}/unstable/feed/${TARGET_ARCH}/machine/${MACHINE}" - inherit image - -LICENSE = "MIT" diff --git a/packages/images/pivotboot-image.bb b/packages/images/pivotboot-image.bb index 529e4cdb83..0aa7fdc575 100644 --- a/packages/images/pivotboot-image.bb +++ b/packages/images/pivotboot-image.bb @@ -1,10 +1,6 @@ -export IMAGE_BASENAME = "pivotboot-image" -export IMAGE_LINGUAS = "" -export PACKAGE_INSTALL = "task-pivotboot" +IMAGE_LINGUAS = "" +IMAGE_INSTALL = "task-pivotboot" DEPENDS = "task-pivotboot" -PR = "r1" inherit image - -LICENSE = "MIT" diff --git a/packages/images/sdl-image.bb b/packages/images/sdl-image.bb index d6a0b4b881..9101d88e9c 100644 --- a/packages/images/sdl-image.bb +++ b/packages/images/sdl-image.bb @@ -1,9 +1,5 @@ -LICENSE = "MIT" - -export IMAGE_BASENAME = "sdl-image" - DEPENDS = "${MACHINE_TASK_PROVIDER} task-sdl" -export PACKAGE_INSTALL = "${MACHINE_TASK_PROVIDER} sdl-base" +IMAGE_INSTALL = "${MACHINE_TASK_PROVIDER} sdl-base" inherit image diff --git a/packages/images/sectest-gpe-image.bb b/packages/images/sectest-gpe-image.bb index a56991b902..6249afa8cc 100644 --- a/packages/images/sectest-gpe-image.bb +++ b/packages/images/sectest-gpe-image.bb @@ -1,8 +1,3 @@ -LICENSE = "MIT" -PR = "r6" - -export IMAGE_BASENAME = "sectest-gpe-image" - GPE_EXTRA_THEMES = "\ gtk-theme-industrial \ gtk-industrial-engine \ @@ -19,9 +14,8 @@ GPE_EXTRA_INSTALL += "${GPE_EXTRA_INSTALL_${GUI_MACHINE_CLASS}}" XSERVER ?= "xserver-kdrive-fbdev" DEPENDS = "${MACHINE_TASK_PROVIDER} task-gpe" -RDEPENDS = "${PACKAGE_INSTALL}" -export PACKAGE_INSTALL = "\ +IMAGE_INSTALL = "\ ${MACHINE_TASK_PROVIDER} \ gpe-task-base \ gpe-task-pim \ diff --git a/packages/images/slugos-image.bb b/packages/images/slugos-image.bb index be746009b6..9f6a2aaa4f 100644 --- a/packages/images/slugos-image.bb +++ b/packages/images/slugos-image.bb @@ -5,11 +5,9 @@ # DESCRIPTION = "Generic SlugOS image" HOMEPAGE = "http://www.nslu2-linux.org" -LICENSE = "MIT" -PR = "r46" DEPENDS = "task-slugos" -PACKAGE_INSTALL = "task-slugos" +IMAGE_INSTALL = "task-slugos" COMPATIBLE_MACHINE = "nslu2" diff --git a/packages/images/twin-image.bb b/packages/images/twin-image.bb index a0e68c9bb8..56677f5dda 100644 --- a/packages/images/twin-image.bb +++ b/packages/images/twin-image.bb @@ -1,5 +1,3 @@ -export IMAGE_BASENAME="twin-image" - DEPENDS = '${MACHINE_TASK_PROVIDER} \ twin \ orpheus \ @@ -7,12 +5,12 @@ DEPENDS = '${MACHINE_TASK_PROVIDER} \ vim \ mutt' -export PACKAGE_INSTALL = '${MACHINE_TASK_PROVIDER} \ - twin \ - orpheus \ - nano \ - vim \ - mutt' +IMAGE_INSTALL = '\ + ${MACHINE_TASK_PROVIDER} \ + twin \ + orpheus \ + nano \ + vim \ + mutt' inherit image -LICENSE = "MIT" diff --git a/packages/images/uml-image.bb b/packages/images/uml-image.bb index 43afa3059d..9255c8c08a 100644 --- a/packages/images/uml-image.bb +++ b/packages/images/uml-image.bb @@ -1,12 +1,10 @@ DESCRIPTION = "A rootfs for User-Mode-Linux" -export IMAGE_BASENAME = "uml-image" - OPIE_LIBS = "qte qpf-bitstream-vera libqpe-opie libopie2" OPIE_BASE = "opie-qcop opie-quicklauncher opie-taskbar" DEPENDS = "${MACHINE_TASK_PROVIDER}" -export PACKAGE_INSTALL = "${DEPENDS}" +IMAGE_INSTALL = "${DEPENDS}" inherit image -LICENSE = "MIT" + diff --git a/packages/images/unslung-image.bb b/packages/images/unslung-image.bb index a24271a9d6..c6d4e73718 100644 --- a/packages/images/unslung-image.bb +++ b/packages/images/unslung-image.bb @@ -1,5 +1,3 @@ -LICENSE = "MIT" -PR = "r26" COMPATIBLE_MACHINE = "nslu2" IMAGE_BASENAME = "unslung" @@ -11,11 +9,7 @@ USE_DEVFS = "1" DEPENDS = "virtual/kernel \ ${UNSLUNG_EXTRA_DEPENDS}" -RDEPENDS = "kernel update-modules unslung-rootfs \ - libc6-unslung slingbox ipkg libipkg \ - ${UNSLUNG_EXTRA_RDEPENDS}" - -PACKAGE_INSTALL = "kernel update-modules unslung-rootfs \ +IMAGE_INSTALL = "kernel update-modules unslung-rootfs \ libc6-unslung slingbox ipkg libipkg \ kernel-module-netconsole \ ${UNSLUNG_EXTRA_INSTALL}" diff --git a/packages/images/xfce-image.bb b/packages/images/xfce-image.bb index d5d48233a7..70c183c897 100644 --- a/packages/images/xfce-image.bb +++ b/packages/images/xfce-image.bb @@ -10,8 +10,7 @@ X_RDEPENDS = "${XSERVER}" XFCE_DEPENDS = "${MACHINE_TASK_PROVIDER} task-xfce-base" XFCE_RDEPENDS = "${XFCE_DEPENDS}" -export PACKAGE_INSTALL = "${X_RDEPENDS} ${XFCE_RDEPENDS}" +IMAGE_INSTALL = "${X_RDEPENDS} ${XFCE_RDEPENDS}" DEPENDS = "${X_DEPENDS} ${XFCE_DEPENDS}" inherit image -LICENSE = "MIT" diff --git a/packages/images/xterminal-image.bb b/packages/images/xterminal-image.bb index 3b4576e5bb..726fbf7421 100644 --- a/packages/images/xterminal-image.bb +++ b/packages/images/xterminal-image.bb @@ -4,8 +4,7 @@ IMAGE_LINGUAS = "" XTERMINAL_PACKAGES = "${MACHINE_TASK_PROVIDER} task-xterminal" -export PACKAGE_INSTALL = "${XTERMINAL_PACKAGES}" +IMAGE_INSTALL = "${XTERMINAL_PACKAGES}" DEPENDS = "${XTERMINAL_PACKAGES}" inherit image -LICENSE = "MIT" |