From a7c7d20784667526ec3fce58da7efe2b415aa884 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 31 Dec 2006 23:28:56 +0000 Subject: Rename: image_ipk -> image.bbclass, IPKG_INSTALL -> PACKAGE_INSTALL to prepare for deb packaging --- packages/angstrom/angstrom-bootmanager-image.bb | 4 +- packages/angstrom/angstrom-bootstrap-image.bb | 4 +- packages/angstrom/angstrom-gpe-image.bb | 4 +- packages/images/bootstrap-image-bootchart.bb | 4 +- packages/images/bootstrap-image.bb | 4 +- packages/images/dvb-image.bb | 4 +- packages/images/e-image-core.bb | 4 +- packages/images/e-image.bb | 4 +- packages/images/essential-image.bb | 4 +- packages/images/essential-machine-image.bb | 4 +- packages/images/gpe-image.bb | 6 +-- packages/images/jlime-opie.bb | 68 +++++++++++++++++++++++++ packages/images/maemo-image.bb | 4 +- packages/images/mythfront-image.bb | 4 +- packages/images/nslu2-linksys-image.bb | 6 +-- packages/images/nylon-image-base.bb | 4 +- packages/images/nylon-image-mini.bb | 4 +- packages/images/openprotium-image.bb | 4 +- packages/images/opie-image.bb | 4 +- packages/images/opie-kdepim-image.bb | 2 +- packages/images/ossie-image.bb | 4 +- packages/images/pivotboot-image.bb | 4 +- packages/images/sdl-image.bb | 4 +- packages/images/sectest-gpe-image.bb | 6 +-- packages/images/slugos-image.bb | 4 +- packages/images/twin-image.bb | 4 +- packages/images/uml-image.bb | 4 +- packages/images/unslung-image.bb | 4 +- packages/images/xfce-image.bb | 4 +- packages/images/xterminal-image.bb | 4 +- packages/meta/jlime-opie.bb | 68 ------------------------- packages/tasks/task-ossie.bb | 2 +- 32 files changed, 129 insertions(+), 129 deletions(-) create mode 100644 packages/images/jlime-opie.bb delete mode 100644 packages/meta/jlime-opie.bb (limited to 'packages') diff --git a/packages/angstrom/angstrom-bootmanager-image.bb b/packages/angstrom/angstrom-bootmanager-image.bb index 9a0bf12a08..43c25eb1ba 100644 --- a/packages/angstrom/angstrom-bootmanager-image.bb +++ b/packages/angstrom/angstrom-bootmanager-image.bb @@ -7,9 +7,9 @@ RDEPENDS = "angstrom-base-depends angstrom-bootmanager" export IMAGE_BASENAME = "bootmanager-image" export IMAGE_LINGUAS = "" -export IPKG_INSTALL = "${RDEPENDS}" +export PACKAGE_INSTALL = "${RDEPENDS}" -inherit image_ipk +inherit image diff --git a/packages/angstrom/angstrom-bootstrap-image.bb b/packages/angstrom/angstrom-bootstrap-image.bb index d4ce272558..3977e223af 100644 --- a/packages/angstrom/angstrom-bootstrap-image.bb +++ b/packages/angstrom/angstrom-bootstrap-image.bb @@ -12,7 +12,7 @@ RDEPENDS = "task-base-core-default \ export IMAGE_BASENAME = "bootstrap-image" export IMAGE_LINGUAS = "" -export IPKG_INSTALL = "${RDEPENDS}" +export PACKAGE_INSTALL = "${RDEPENDS}" -inherit image_ipk +inherit image diff --git a/packages/angstrom/angstrom-gpe-image.bb b/packages/angstrom/angstrom-gpe-image.bb index 78f6b038ae..d366a62bf7 100644 --- a/packages/angstrom/angstrom-gpe-image.bb +++ b/packages/angstrom/angstrom-gpe-image.bb @@ -25,9 +25,9 @@ RDEPENDS = "\ ${ANGSTROM_EXTRA_INSTALL}" -export IPKG_INSTALL = "${RDEPENDS}" +export PACKAGE_INSTALL = "${RDEPENDS}" #zap root password for release images ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}' -inherit image_ipk +inherit image diff --git a/packages/images/bootstrap-image-bootchart.bb b/packages/images/bootstrap-image-bootchart.bb index 00a1e391c6..dea254eaa5 100644 --- a/packages/images/bootstrap-image-bootchart.bb +++ b/packages/images/bootstrap-image-bootchart.bb @@ -1,10 +1,10 @@ export IMAGE_BASENAME = "bootstrap-image-bootchart" export IMAGE_LINGUAS = "" -export IPKG_INSTALL = "${MACHINE_TASK_PROVIDER} bootchart acct" +export PACKAGE_INSTALL = "${MACHINE_TASK_PROVIDER} bootchart acct" DEPENDS = "${MACHINE_TASK_PROVIDER} bootchart" RDEPENDS = "acct" -inherit image_ipk +inherit image LICENSE = "MIT" diff --git a/packages/images/bootstrap-image.bb b/packages/images/bootstrap-image.bb index 5731d94159..1ff60e60e1 100644 --- a/packages/images/bootstrap-image.bb +++ b/packages/images/bootstrap-image.bb @@ -1,10 +1,10 @@ export IMAGE_BASENAME = "bootstrap-image" export IMAGE_LINGUAS = "" -export IPKG_INSTALL = "${MACHINE_TASK_PROVIDER}" +export PACKAGE_INSTALL = "${MACHINE_TASK_PROVIDER}" DEPENDS = "${MACHINE_TASK_PROVIDER}" -inherit image_ipk +inherit image FEED_URIS_append_familiar = " x11##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/x11 \ opie##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/opie" diff --git a/packages/images/dvb-image.bb b/packages/images/dvb-image.bb index a6687d2f46..c4636b12aa 100644 --- a/packages/images/dvb-image.bb +++ b/packages/images/dvb-image.bb @@ -4,8 +4,8 @@ IMAGE_LINGUAS = "" DVB_PACKAGES = "${MACHINE_TASK_PROVIDER} task-dvb" -export IPKG_INSTALL = "${DVB_PACKAGES}" +export PACKAGE_INSTALL = "${DVB_PACKAGES}" DEPENDS = "${DVB_PACKAGES}" -inherit image_ipk +inherit image LICENSE = "MIT" diff --git a/packages/images/e-image-core.bb b/packages/images/e-image-core.bb index f41f04ee23..c713437361 100644 --- a/packages/images/e-image-core.bb +++ b/packages/images/e-image-core.bb @@ -16,6 +16,6 @@ PREFERRED_PROVIDER_virtual/imlib2 = "imlib2-x11" PREFERRED_PROVIDER_virtual/libxine = "libxine-x11" PREFERRED_PROVIDER_libx11 = "libx11" -export IPKG_INSTALL = "${MACHINE_TASK_PROVIDER} task-e-x11-core xserver-kdrive-fbdev glibc-charmap-utf-8 glibc-localedata-i18n" +export PACKAGE_INSTALL = "${MACHINE_TASK_PROVIDER} task-e-x11-core xserver-kdrive-fbdev glibc-charmap-utf-8 glibc-localedata-i18n" -inherit image_ipk +inherit image diff --git a/packages/images/e-image.bb b/packages/images/e-image.bb index e42df3f35b..2f0bef98ef 100644 --- a/packages/images/e-image.bb +++ b/packages/images/e-image.bb @@ -3,7 +3,7 @@ DESCRIPTION = "An X11-based distribution with the Enlightenment Window Manager a PR = "r5" export IMAGE_BASENAME = "e-image" -export IPKG_INSTALL += "task-e-x11-core \ +export PACKAGE_INSTALL += "task-e-x11-core \ gpe-task-pim \ gpe-task-settings \ gpe-task-apps \ @@ -32,4 +32,4 @@ export IPKG_INSTALL += "task-e-x11-core \ DEPENDS += "task-e-x11-core task-gpe figment xhost gpe-soundserver gpe-confd xauth" -RDEPENDS = "${IPKG_INSTALL}" +RDEPENDS = "${PACKAGE_INSTALL}" diff --git a/packages/images/essential-image.bb b/packages/images/essential-image.bb index 2388a0e3f7..9544b82ead 100644 --- a/packages/images/essential-image.bb +++ b/packages/images/essential-image.bb @@ -15,7 +15,7 @@ PR = "r0" ###################################################################################### -inherit image_ipk +inherit image ###################################################################################### @@ -25,4 +25,4 @@ DEPENDS = "task-essential-to-boot" export IMAGE_BASENAME = "essential-image" export IMAGE_LINGUAS = "" -export IPKG_INSTALL = "task-essential-to-boot" +export PACKAGE_INSTALL = "task-essential-to-boot" diff --git a/packages/images/essential-machine-image.bb b/packages/images/essential-machine-image.bb index 38a8d6c237..70ce1e119a 100644 --- a/packages/images/essential-machine-image.bb +++ b/packages/images/essential-machine-image.bb @@ -15,7 +15,7 @@ PR = "r0" ###################################################################################### -inherit image_ipk +inherit image ###################################################################################### @@ -33,4 +33,4 @@ MACHINE_TASKS_akita = "task-essential-to-boot \ export IMAGE_BASENAME = "essential-image" export IMAGE_LINGUAS = "" -export IPKG_INSTALL = "${MACHINE_TASKS}" +export PACKAGE_INSTALL = "${MACHINE_TASKS}" diff --git a/packages/images/gpe-image.bb b/packages/images/gpe-image.bb index 53c6d5f8f9..b448c0a9b1 100644 --- a/packages/images/gpe-image.bb +++ b/packages/images/gpe-image.bb @@ -25,9 +25,9 @@ GPE_EXTRA_INSTALL += "${GPE_BIGFLASH_INSTALL}" XSERVER ?= "xserver-kdrive-fbdev" DEPENDS = "${MACHINE_TASK_PROVIDER} task-gpe" -RDEPENDS = "${IPKG_INSTALL}" +RDEPENDS = "${PACKAGE_INSTALL}" -export IPKG_INSTALL = "\ +export PACKAGE_INSTALL = "\ ${MACHINE_TASK_PROVIDER} \ gpe-task-base \ gpe-task-pim \ @@ -38,5 +38,5 @@ export IPKG_INSTALL = "\ #ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; " -inherit image_ipk +inherit image LICENSE = "MIT" diff --git a/packages/images/jlime-opie.bb b/packages/images/jlime-opie.bb new file mode 100644 index 0000000000..a6f8b7989a --- /dev/null +++ b/packages/images/jlime-opie.bb @@ -0,0 +1,68 @@ +export IMAGE_BASENAME = "jlime-opie" +export IMAGE_LINGUAS = "" + +LICENSE = "MIT" +PR = "r21" + +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)}' + +INSTALL_PACKAGES = "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 \ + task-opie-extra-settings \ + 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() { + + if ! test -z "${FEED_URIS}" + then + # Die gracefully if ipkg-collateral failed + if ! test -e "${IMAGE_ROOTFS}/etc/ipkg.conf" + then + echo "[${IMAGE_ROOTFS}/etc/ipkg.conf] is missing!" + exit 1 + fi + + # comment out existing feed-sources inserted by ipkg-collateral + cat ${IMAGE_ROOTFS}/etc/ipkg.conf | sed "s/^src\ /#src\ /" > ${IMAGE_ROOTFS}/etc/ipkg.conf_ + rm ${IMAGE_ROOTFS}/etc/ipkg.conf && mv ${IMAGE_ROOTFS}/etc/ipkg.conf_ ${IMAGE_ROOTFS}/etc/ipkg.conf + + # extract, then delete destinations + cat ${IMAGE_ROOTFS}/etc/ipkg.conf | egrep "^dest\ " > ${IMAGE_ROOTFS}/etc/ipkg.conf.dest + cat ${IMAGE_ROOTFS}/etc/ipkg.conf | egrep -v "^dest\ " > ${IMAGE_ROOTFS}/etc/ipkg.conf_ + rm ${IMAGE_ROOTFS}/etc/ipkg.conf && mv ${IMAGE_ROOTFS}/etc/ipkg.conf_ ${IMAGE_ROOTFS}/etc/ipkg.conf + + + for line in ${FEED_URIS} + do + # strip leading and trailing spaces/tabs, then split into name and uri + line_clean="`echo "$line"|sed 's/^[ \t]*//;s/[ \t]*$//'`" + feed_name="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\1/p'`" + feed_uri="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\2/p'`" + + # insert new feed-sources + echo "src/gz $feed_name $feed_uri" >> ${IMAGE_ROOTFS}/etc/ipkg.conf + done + + # remove temporary files and rebuild ipkg.conf + echo "" >> ${IMAGE_ROOTFS}/etc/ipkg.conf + cat ${IMAGE_ROOTFS}/etc/ipkg.conf.dest >> ${IMAGE_ROOTFS}/etc/ipkg.conf + rm ${IMAGE_ROOTFS}/etc/ipkg.conf.dest + + # remove -feed.conf files which are no longer needed + cd ${IMAGE_ROOTFS}/etc/ipkg/ && rm -- *-feed.conf + fi +} + +# merge feed-sources into ipkg.conf and create /etc/timestamp from build date +IMAGE_PREPROCESS_COMMAND = "merge_feeds; create_etc_timestamp" + +inherit image diff --git a/packages/images/maemo-image.bb b/packages/images/maemo-image.bb index d0368cb025..2153e427c1 100644 --- a/packages/images/maemo-image.bb +++ b/packages/images/maemo-image.bb @@ -19,9 +19,9 @@ DEPENDS = "${MACHINE_TASK_PROVIDER} \ meta-maemo \ ${MAEMO_EXTRA_DEPENDS}" -export IPKG_INSTALL = "${MACHINE_TASK_PROVIDER} maemo-task-base maemo-task-theme \ +export PACKAGE_INSTALL = "${MACHINE_TASK_PROVIDER} maemo-task-base maemo-task-theme \ maemo-task-apps ${MAEMO_EXTRA_INSTALL} \ ${XSERVER}" -inherit image_ipk +inherit image LICENSE = "MIT" diff --git a/packages/images/mythfront-image.bb b/packages/images/mythfront-image.bb index 9bfedcf222..49e6b5ae2b 100644 --- a/packages/images/mythfront-image.bb +++ b/packages/images/mythfront-image.bb @@ -6,8 +6,8 @@ IMAGE_LINGUAS = "" MYTHFRONT_PACKAGES = "${MACHINE_TASK_PROVIDER} task-mythfront" -export IPKG_INSTALL = "${MYTHFRONT_PACKAGES}" +export PACKAGE_INSTALL = "${MYTHFRONT_PACKAGES}" DEPENDS = "${MYTHFRONT_PACKAGES}" -inherit image_ipk +inherit image LICENSE = "MIT" diff --git a/packages/images/nslu2-linksys-image.bb b/packages/images/nslu2-linksys-image.bb index 18329c913c..7cfad432a3 100644 --- a/packages/images/nslu2-linksys-image.bb +++ b/packages/images/nslu2-linksys-image.bb @@ -3,12 +3,12 @@ USE_DEVFS = "1" IMAGE_BASENAME = "nslu2-linksys" -IPKG_INSTALL = "nslu2-linksys-ramdisk" +PACKAGE_INSTALL = "nslu2-linksys-ramdisk" -DEPENDS = "nslu2-linksys-kernel ${IPKG_INSTALL}" +DEPENDS = "nslu2-linksys-kernel ${PACKAGE_INSTALL}" 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_ipk +inherit image LICENSE = "MIT" diff --git a/packages/images/nylon-image-base.bb b/packages/images/nylon-image-base.bb index 267233445c..120cff5822 100644 --- a/packages/images/nylon-image-base.bb +++ b/packages/images/nylon-image-base.bb @@ -1,4 +1,4 @@ -inherit image_ipk +inherit image inherit nylon-image LICENSE = "MIT" @@ -21,7 +21,7 @@ RDEPENDS_append_mtx-2 = " modutils modutils-initscripts modutils-depmod modutils ## kernel 2.6 ## RDEPENDS_append_mtx-3 = " module-init-tools udev" -export IPKG_INSTALL = "${RDEPENDS}" +export PACKAGE_INSTALL = "${RDEPENDS}" IMAGE_LINGUAS = "" diff --git a/packages/images/nylon-image-mini.bb b/packages/images/nylon-image-mini.bb index b1f55917a6..e6acd1f2dc 100644 --- a/packages/images/nylon-image-mini.bb +++ b/packages/images/nylon-image-mini.bb @@ -11,9 +11,9 @@ NYLON_BASE = "base-files base-passwd busybox \ RDEPENDS = "kernel \ ${NYLON_BASE} ${BOOTSTRAP_EXTRA_RDEPENDS}" -export IPKG_INSTALL = "${RDEPENDS}" +export PACKAGE_INSTALL = "${RDEPENDS}" IMAGE_LINGUAS = "" -inherit image_ipk +inherit image LICENSE = "MIT" diff --git a/packages/images/openprotium-image.bb b/packages/images/openprotium-image.bb index 55477096d8..faec2664ca 100644 --- a/packages/images/openprotium-image.bb +++ b/packages/images/openprotium-image.bb @@ -103,9 +103,9 @@ RDEPENDS = " \ ${OPENPROTIUM_KERNEL} " # ${SLUGOS_EXTRA_RDEPENDS}" -IPKG_INSTALL = "${RDEPENDS}" +PACKAGE_INSTALL = "${RDEPENDS}" -inherit image_ipk +inherit image storcenter_pack_image() { # find latest kernel diff --git a/packages/images/opie-image.bb b/packages/images/opie-image.bb index 172e4111aa..3613ccafde 100644 --- a/packages/images/opie-image.bb +++ b/packages/images/opie-image.bb @@ -17,7 +17,7 @@ INSTALL_PACKAGES = "${MACHINE_TASK_PROVIDER} task-opie-base task-opie-base-apple INSTALL_PACKAGES_spitz_append = "task-opie-extra-games task-opie-extra-apps task-opie-extra-styles" INSTALL_PACKAGES_akita_append = "task-opie-extra-games task-opie-extra-apps task-opie-extra-styles" -export IPKG_INSTALL = "${INSTALL_PACKAGES}" +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() { @@ -65,4 +65,4 @@ merge_feeds() { # merge feed-sources into ipkg.conf and create /etc/timestamp from build date IMAGE_PREPROCESS_COMMAND = "merge_feeds; create_etc_timestamp" -inherit image_ipk +inherit image diff --git a/packages/images/opie-kdepim-image.bb b/packages/images/opie-kdepim-image.bb index 7fdc22126b..477d924c2c 100644 --- a/packages/images/opie-kdepim-image.bb +++ b/packages/images/opie-kdepim-image.bb @@ -7,4 +7,4 @@ export IMAGE_BASENAME = "opie-kdepim-image" INSTALL_PACKAGES += "kopi kapi kammu kopi-applet" -export IPKG_INSTALL = "${INSTALL_PACKAGES}" +export PACKAGE_INSTALL = "${INSTALL_PACKAGES}" diff --git a/packages/images/ossie-image.bb b/packages/images/ossie-image.bb index 59f49cf06c..7f7cfbd2e0 100644 --- a/packages/images/ossie-image.bb +++ b/packages/images/ossie-image.bb @@ -1,6 +1,6 @@ export IMAGE_BASENAME = "ossie-image" export IMAGE_LINGUAS = "" -export IPKG_INSTALL = "${MACHINE_TASK_PROVIDER} task-ossie" +export PACKAGE_INSTALL = "${MACHINE_TASK_PROVIDER} task-ossie" DEPENDS = "${MACHINE_TASK_PROVIDER} task-ossie" @@ -14,6 +14,6 @@ FEED_URIS += " \ ${MACHINE}##${OSSIE_URI}/unstable/feed/${TARGET_ARCH}/machine/${MACHINE}" -inherit image_ipk +inherit image LICENSE = "MIT" diff --git a/packages/images/pivotboot-image.bb b/packages/images/pivotboot-image.bb index 50634e0353..78c3d7a6e9 100644 --- a/packages/images/pivotboot-image.bb +++ b/packages/images/pivotboot-image.bb @@ -1,11 +1,11 @@ export IMAGE_BASENAME = "pivotboot-image" export IMAGE_LINGUAS = "" -export IPKG_INSTALL = "task-pivotboot" +export PACKAGE_INSTALL = "task-pivotboot" DEPENDS = "task-pivotboot" PR = "r1" -inherit image_ipk +inherit image FEED_URIS_append_familiar = " x11##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/x11 \ opie##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/opie" diff --git a/packages/images/sdl-image.bb b/packages/images/sdl-image.bb index 0e8f8567f5..d6a0b4b881 100644 --- a/packages/images/sdl-image.bb +++ b/packages/images/sdl-image.bb @@ -4,6 +4,6 @@ export IMAGE_BASENAME = "sdl-image" DEPENDS = "${MACHINE_TASK_PROVIDER} task-sdl" -export IPKG_INSTALL = "${MACHINE_TASK_PROVIDER} sdl-base" +export PACKAGE_INSTALL = "${MACHINE_TASK_PROVIDER} sdl-base" -inherit image_ipk +inherit image diff --git a/packages/images/sectest-gpe-image.bb b/packages/images/sectest-gpe-image.bb index 9a068bf9db..fa16437662 100644 --- a/packages/images/sectest-gpe-image.bb +++ b/packages/images/sectest-gpe-image.bb @@ -21,9 +21,9 @@ GPE_EXTRA_INSTALL += "${GPE_EXTRA_INSTALL_${GUI_MACHINE_CLASS}}" XSERVER ?= "xserver-kdrive-fbdev" DEPENDS = "${MACHINE_TASK_PROVIDER} task-gpe" -RDEPENDS = "${IPKG_INSTALL}" +RDEPENDS = "${PACKAGE_INSTALL}" -export IPKG_INSTALL = "\ +export PACKAGE_INSTALL = "\ ${MACHINE_TASK_PROVIDER} \ gpe-task-base \ gpe-task-pim \ @@ -34,5 +34,5 @@ export IPKG_INSTALL = "\ ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; " -inherit image_ipk +inherit image diff --git a/packages/images/slugos-image.bb b/packages/images/slugos-image.bb index 0e034005e7..cf7d580928 100644 --- a/packages/images/slugos-image.bb +++ b/packages/images/slugos-image.bb @@ -91,9 +91,9 @@ RDEPENDS = "kernel ixp4xx-npe \ ${SLUGOS_KERNEL} \ ${SLUGOS_EXTRA_RDEPENDS}" -IPKG_INSTALL = "${RDEPENDS}" +PACKAGE_INSTALL = "${RDEPENDS}" -inherit image_ipk +inherit image python () { # Don't build slugos images unless the configuration is set up diff --git a/packages/images/twin-image.bb b/packages/images/twin-image.bb index b2f3ec4c43..a0e68c9bb8 100644 --- a/packages/images/twin-image.bb +++ b/packages/images/twin-image.bb @@ -7,12 +7,12 @@ DEPENDS = '${MACHINE_TASK_PROVIDER} \ vim \ mutt' -export IPKG_INSTALL = '${MACHINE_TASK_PROVIDER} \ +export PACKAGE_INSTALL = '${MACHINE_TASK_PROVIDER} \ twin \ orpheus \ nano \ vim \ mutt' -inherit image_ipk +inherit image LICENSE = "MIT" diff --git a/packages/images/uml-image.bb b/packages/images/uml-image.bb index 1983d03849..43afa3059d 100644 --- a/packages/images/uml-image.bb +++ b/packages/images/uml-image.bb @@ -6,7 +6,7 @@ OPIE_LIBS = "qte qpf-bitstream-vera libqpe-opie libopie2" OPIE_BASE = "opie-qcop opie-quicklauncher opie-taskbar" DEPENDS = "${MACHINE_TASK_PROVIDER}" -export IPKG_INSTALL = "${DEPENDS}" +export PACKAGE_INSTALL = "${DEPENDS}" -inherit image_ipk +inherit image LICENSE = "MIT" diff --git a/packages/images/unslung-image.bb b/packages/images/unslung-image.bb index 58f61b10d5..b56f007523 100644 --- a/packages/images/unslung-image.bb +++ b/packages/images/unslung-image.bb @@ -18,7 +18,7 @@ RDEPENDS = "kernel update-modules unslung-rootfs \ # findutils \ ${UNSLUNG_EXTRA_RDEPENDS}" -IPKG_INSTALL = "kernel update-modules unslung-rootfs \ +PACKAGE_INSTALL = "kernel update-modules unslung-rootfs \ libc6-unslung slingbox ipkg \ libipkg \ # cpio \ @@ -28,7 +28,7 @@ IPKG_INSTALL = "kernel update-modules unslung-rootfs \ IMAGE_PREPROCESS_COMMAND += "unslung_clean_image; " -inherit image_ipk +inherit image # Note that anything in this function must be repeatable without having to rebuild the rootfs unslung_clean_image () { diff --git a/packages/images/xfce-image.bb b/packages/images/xfce-image.bb index a681428aa6..42b0907b2b 100644 --- a/packages/images/xfce-image.bb +++ b/packages/images/xfce-image.bb @@ -8,8 +8,8 @@ X_RDEPENDS = "xserver-kdrive-fbdev" XFCE_DEPENDS = "${MACHINE_TASK_PROVIDER} task-xfce-base" XFCE_RDEPENDS = "${XFCE_DEPENDS}" -export IPKG_INSTALL = "${X_RDEPENDS} ${XFCE_RDEPENDS}" +export PACKAGE_INSTALL = "${X_RDEPENDS} ${XFCE_RDEPENDS}" DEPENDS = "${X_DEPENDS} ${XFCE_DEPENDS}" -inherit image_ipk +inherit image LICENSE = "MIT" diff --git a/packages/images/xterminal-image.bb b/packages/images/xterminal-image.bb index 174766edfa..3b4576e5bb 100644 --- a/packages/images/xterminal-image.bb +++ b/packages/images/xterminal-image.bb @@ -4,8 +4,8 @@ IMAGE_LINGUAS = "" XTERMINAL_PACKAGES = "${MACHINE_TASK_PROVIDER} task-xterminal" -export IPKG_INSTALL = "${XTERMINAL_PACKAGES}" +export PACKAGE_INSTALL = "${XTERMINAL_PACKAGES}" DEPENDS = "${XTERMINAL_PACKAGES}" -inherit image_ipk +inherit image LICENSE = "MIT" diff --git a/packages/meta/jlime-opie.bb b/packages/meta/jlime-opie.bb deleted file mode 100644 index 679dacdf2d..0000000000 --- a/packages/meta/jlime-opie.bb +++ /dev/null @@ -1,68 +0,0 @@ -export IMAGE_BASENAME = "jlime-opie" -export IMAGE_LINGUAS = "" - -LICENSE = "MIT" -PR = "r21" - -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)}' - -INSTALL_PACKAGES = "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 \ - task-opie-extra-settings \ - task-opie-bluetooth task-opie-irda \ - ${extra_stuff}" - -export IPKG_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() { - - if ! test -z "${FEED_URIS}" - then - # Die gracefully if ipkg-collateral failed - if ! test -e "${IMAGE_ROOTFS}/etc/ipkg.conf" - then - echo "[${IMAGE_ROOTFS}/etc/ipkg.conf] is missing!" - exit 1 - fi - - # comment out existing feed-sources inserted by ipkg-collateral - cat ${IMAGE_ROOTFS}/etc/ipkg.conf | sed "s/^src\ /#src\ /" > ${IMAGE_ROOTFS}/etc/ipkg.conf_ - rm ${IMAGE_ROOTFS}/etc/ipkg.conf && mv ${IMAGE_ROOTFS}/etc/ipkg.conf_ ${IMAGE_ROOTFS}/etc/ipkg.conf - - # extract, then delete destinations - cat ${IMAGE_ROOTFS}/etc/ipkg.conf | egrep "^dest\ " > ${IMAGE_ROOTFS}/etc/ipkg.conf.dest - cat ${IMAGE_ROOTFS}/etc/ipkg.conf | egrep -v "^dest\ " > ${IMAGE_ROOTFS}/etc/ipkg.conf_ - rm ${IMAGE_ROOTFS}/etc/ipkg.conf && mv ${IMAGE_ROOTFS}/etc/ipkg.conf_ ${IMAGE_ROOTFS}/etc/ipkg.conf - - - for line in ${FEED_URIS} - do - # strip leading and trailing spaces/tabs, then split into name and uri - line_clean="`echo "$line"|sed 's/^[ \t]*//;s/[ \t]*$//'`" - feed_name="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\1/p'`" - feed_uri="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\2/p'`" - - # insert new feed-sources - echo "src/gz $feed_name $feed_uri" >> ${IMAGE_ROOTFS}/etc/ipkg.conf - done - - # remove temporary files and rebuild ipkg.conf - echo "" >> ${IMAGE_ROOTFS}/etc/ipkg.conf - cat ${IMAGE_ROOTFS}/etc/ipkg.conf.dest >> ${IMAGE_ROOTFS}/etc/ipkg.conf - rm ${IMAGE_ROOTFS}/etc/ipkg.conf.dest - - # remove -feed.conf files which are no longer needed - cd ${IMAGE_ROOTFS}/etc/ipkg/ && rm -- *-feed.conf - fi -} - -# merge feed-sources into ipkg.conf and create /etc/timestamp from build date -IMAGE_PREPROCESS_COMMAND = "merge_feeds; create_etc_timestamp" - -inherit image_ipk diff --git a/packages/tasks/task-ossie.bb b/packages/tasks/task-ossie.bb index 98f0a2d368..cd050342aa 100644 --- a/packages/tasks/task-ossie.bb +++ b/packages/tasks/task-ossie.bb @@ -7,7 +7,7 @@ PACKAGES = "task-ossie" ALLOW_EMPTY = "1" -IPKG_INSTALL = "${OSSIE_BASE} ${OSSIE_PLATFORM} ${OSSIE_COMPONENTS} ${OSSIE_WAVEFORMS}" +PACKAGE_INSTALL = "${OSSIE_BASE} ${OSSIE_PLATFORM} ${OSSIE_COMPONENTS} ${OSSIE_WAVEFORMS}" OSSIE_BASE = "screen procps xerces-c omniorb usrp" OSSIE_PLATFORM = "ossiecf ossie-standardinterfaces ossie-nodebooter ossie-c-wavloader" -- cgit v1.2.3