[oe-commits] org.oe.dev Rename: image_ipk -> image.bbclass, IPKG_INSTALL -> PACKAGE_INSTALL to prepare for deb packaging
rpurdie commit
openembedded-commits at lists.openembedded.org
Sun Dec 31 23:32:08 UTC 2006
Rename: image_ipk -> image.bbclass, IPKG_INSTALL -> PACKAGE_INSTALL to prepare for deb packaging
Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 6a0209f27e10d715dd5e43e31a83e6f1cd4da481
ViewMTN: http://monotone.openembedded.org/revision.psp?id=6a0209f27e10d715dd5e43e31a83e6f1cd4da481
Files:
1
classes/image_ipk.bbclass
classes/image.bbclass
packages/meta/jlime-opie.bb
packages/images/jlime-opie.bb
classes/rootfs_ipk.bbclass
classes/wrt-image.bbclass
contrib/oe-stylize.py
packages/angstrom/angstrom-bootmanager-image.bb
packages/angstrom/angstrom-bootstrap-image.bb
packages/angstrom/angstrom-gpe-image.bb
packages/images/bootstrap-image-bootchart.bb
packages/images/bootstrap-image.bb
packages/images/dvb-image.bb
packages/images/e-image-core.bb
packages/images/e-image.bb
packages/images/essential-image.bb
packages/images/essential-machine-image.bb
packages/images/gpe-image.bb
packages/images/maemo-image.bb
packages/images/mythfront-image.bb
packages/images/nslu2-linksys-image.bb
packages/images/nylon-image-base.bb
packages/images/nylon-image-mini.bb
packages/images/openprotium-image.bb
packages/images/opie-image.bb
packages/images/opie-kdepim-image.bb
packages/images/ossie-image.bb
packages/images/pivotboot-image.bb
packages/images/sdl-image.bb
packages/images/sectest-gpe-image.bb
packages/images/slugos-image.bb
packages/images/twin-image.bb
packages/images/uml-image.bb
packages/images/unslung-image.bb
packages/images/xfce-image.bb
packages/images/xterminal-image.bb
packages/tasks/task-ossie.bb
Diffs:
#
# mt diff -rd44c9019c71ce262d2a01eec34bf8a724a8d40d0 -r6a0209f27e10d715dd5e43e31a83e6f1cd4da481
#
#
#
# rename "classes/image_ipk.bbclass"
# to "classes/image.bbclass"
#
# rename "packages/meta/jlime-opie.bb"
# to "packages/images/jlime-opie.bb"
#
# patch "classes/rootfs_ipk.bbclass"
# from [a759ea9945aa0e70757e50c45b254c6f8fdbc0b0]
# to [c9015e349dc61b0d68ab1a680d61caf97153bfa5]
#
# patch "classes/wrt-image.bbclass"
# from [48067d3fe9233f11f280ec34403908ccf7060376]
# to [de8841acd3ffa235285f1afb86c55cecfe3d2f57]
#
# patch "contrib/oe-stylize.py"
# from [c259462100221e8dd5a85322a9ea080fff7989d2]
# to [e6d7034ad94cfea34288bf45c49e008d2f1c3445]
#
# patch "packages/angstrom/angstrom-bootmanager-image.bb"
# from [5b58e58f9d52047634351977a81461bf2d306b37]
# to [d1a3baa7d2572efe426c8a091cdec5017f742fc0]
#
# patch "packages/angstrom/angstrom-bootstrap-image.bb"
# from [2b737ec60b70df4e95c23833396e9e7d0879a530]
# to [2787c637e68ff172c30b8ac0d8ca094930c122bc]
#
# patch "packages/angstrom/angstrom-gpe-image.bb"
# from [b66ea174b01b03643afb2ed9e2453791843a17f6]
# to [a8f8dca9a6c09828be3e578ff2f78bd6f0f568b5]
#
# patch "packages/images/bootstrap-image-bootchart.bb"
# from [6140fca831887bd42a3e008f0aa8abe4ccc35047]
# to [d396931ba5b08f8e0867a0ebc0d369e2d306d9f6]
#
# patch "packages/images/bootstrap-image.bb"
# from [f383cca522edfeeda1f619b112f0d50167230277]
# to [cc3959f4b48e2ccafc15824705a9405a9bfbc858]
#
# patch "packages/images/dvb-image.bb"
# from [3c10116b1a8834d23ca1cec319c8993de6659d82]
# to [16734b11053e9265e2bbc29b4b490ac5fd4a9e6c]
#
# patch "packages/images/e-image-core.bb"
# from [efca432bc74a9be272be62be417882aad79526e9]
# to [659a155c0c58b510434bacd02e80b3de3e41de7b]
#
# patch "packages/images/e-image.bb"
# from [efa790a6fb676785ec5161204f468d23f5b985ce]
# to [326b9f58a409f5e386ceae400e851a72a65d9669]
#
# patch "packages/images/essential-image.bb"
# from [79eedf8e4c38ef318846522620b2167f2802c957]
# to [ef2c15417b5ab2f5e271b8350f52d834edb490a3]
#
# patch "packages/images/essential-machine-image.bb"
# from [0b7b522eb6441de55dfa8f324f94096c4afae57b]
# to [d9fb64fee1695bb1a8970e99abf0a7eabca4f779]
#
# patch "packages/images/gpe-image.bb"
# from [48e458e7e84410f75076bc36907fc00632053d0a]
# to [fe0890aa6d4711b127027add2cb77d093a762f4b]
#
# patch "packages/images/jlime-opie.bb"
# from [3de734485f0b03a6e7d04e6a2bee28c805956552]
# to [fb0ae30a11e9940340804481a49965ce955f27c8]
#
# patch "packages/images/maemo-image.bb"
# from [a991158a91d533c6b1b11299d50d40e935158b2e]
# to [33a2387b24aa8a75ef9b348b687f5a62eff1ee26]
#
# patch "packages/images/mythfront-image.bb"
# from [ccc2d1badd2a386c202369a14701124275c3e646]
# to [857dbcbe31f405dc5dbf8868591fe8fb13f097b0]
#
# patch "packages/images/nslu2-linksys-image.bb"
# from [0bb3861a7dfaf5a003dfef65d565dfabd452c4ce]
# to [c36ef190014a7d7ea8066f036c2a6bbc81c52f12]
#
# patch "packages/images/nylon-image-base.bb"
# from [98daf01de2688e970fff361d2ae5955d4b42fa3a]
# to [1255705fdb6fd798f6d00869aa56dc09c6dc98c5]
#
# patch "packages/images/nylon-image-mini.bb"
# from [6cc8e266d4130685d22953c34a555d02e48e1369]
# to [4cbffe3c0489c132c323f73eb625ed587c073edb]
#
# patch "packages/images/openprotium-image.bb"
# from [18eee938089f5514c6eff333a88263dc968adc3d]
# to [504f2d248dbaa82c0dd9782ce5cc700e726a5328]
#
# patch "packages/images/opie-image.bb"
# from [e36e2deff4dc1964f36029d37a3ec98aab51dc81]
# to [a5ccd00ff8dd180e49a2d52c9ef658ebf9a58547]
#
# patch "packages/images/opie-kdepim-image.bb"
# from [816304366fa74207bafa16d6a00e608a7e243875]
# to [8696dabcc257470994a6098f36e85d94398fda7f]
#
# patch "packages/images/ossie-image.bb"
# from [250348556d49df32278739433a564f68217dd05b]
# to [b95d3bed33d2e1c5b580842fb3dd52456a12ff10]
#
# patch "packages/images/pivotboot-image.bb"
# from [37ade5b34845eb829b972d0f05d1b05f8bdcc8a4]
# to [bc6c50c3e7e174ef0fc6f73bb0b1b240d45de4f8]
#
# patch "packages/images/sdl-image.bb"
# from [c86d0344b7990532391aeaa1078ac7e631c3a414]
# to [cb3d6b0a957444e5eefe63c10a0d0b69f5809aef]
#
# patch "packages/images/sectest-gpe-image.bb"
# from [e6b18c960cb31657c6bd31398118595bfb8cd675]
# to [88bbb702cd57209c4f3d73d1b1f8284172dad9e4]
#
# patch "packages/images/slugos-image.bb"
# from [f7611e43c3766fc5aac1abccd4d6d048545853ab]
# to [58bfa944ea22166a56df64ec89babc8c5b7e244d]
#
# patch "packages/images/twin-image.bb"
# from [cec4f84b3ab542ded3e55d52b2ad72567697bb88]
# to [d1caa569fe0e916bb5abf973b4c4aa2d27f30b82]
#
# patch "packages/images/uml-image.bb"
# from [eb5c4a449286e3fabbd3778518990cd93de1c848]
# to [8ae454a01f633c2b15ab5aa755c67833fbb683c0]
#
# patch "packages/images/unslung-image.bb"
# from [22595564f678d2263bb0d8e8b6bca42e4f6b4cda]
# to [420e4f67fb2e930e6d9c059b437e424ce5edca64]
#
# patch "packages/images/xfce-image.bb"
# from [4e007df83d0f076dfb6137dadcd431ae967ac7cb]
# to [11348e69cfea62081f398df50514a6b2795958be]
#
# patch "packages/images/xterminal-image.bb"
# from [82c8037004f3d6ddb20d81a5e245c82c5257708e]
# to [9d5a82244519310685a1f59dc69dae7fc6806f42]
#
# patch "packages/tasks/task-ossie.bb"
# from [44531cd7aa4a1509618c4f757921970e5649ceaa]
# to [0b746dbb1bf9b711d2d0bcfed30fd32f9b76b7c2]
#
============================================================
--- classes/rootfs_ipk.bbclass a759ea9945aa0e70757e50c45b254c6f8fdbc0b0
+++ classes/rootfs_ipk.bbclass c9015e349dc61b0d68ab1a680d61caf97153bfa5
@@ -1,8 +1,8 @@
#
# Creates a root filesystem out of IPKs
#
# This rootfs can be mounted via root-nfs or it can be put into an cramfs/jffs etc.
-# See image_ipk.oeclass for a usage of this.
+# See image.bbclass for a usage of this.
#
DEPENDS_prepend="ipkg-native ipkg-utils-native fakeroot-native "
@@ -17,7 +17,7 @@ IPKG_ARGS = "-f ${T}/ipkg.conf -o ${IMAG
IPKG_ARGS = "-f ${T}/ipkg.conf -o ${IMAGE_ROOTFS}"
-IPKG_INSTALL += "ipkg ipkg-collateral"
+PACKAGE_INSTALL += "ipkg ipkg-collateral"
ROOTFS_POSTPROCESS_COMMAND ?= ""
@@ -55,8 +55,8 @@ real_do_rootfs () {
ipkg-cl ${IPKG_ARGS} install $i
done
fi
- if [ ! -z "${IPKG_INSTALL}" ]; then
- ipkg-cl ${IPKG_ARGS} install ${IPKG_INSTALL}
+ if [ ! -z "${PACKAGE_INSTALL}" ]; then
+ ipkg-cl ${IPKG_ARGS} install ${PACKAGE_INSTALL}
fi
export D=${IMAGE_ROOTFS}
============================================================
--- classes/wrt-image.bbclass 48067d3fe9233f11f280ec34403908ccf7060376
+++ classes/wrt-image.bbclass de8841acd3ffa235285f1afb86c55cecfe3d2f57
@@ -1,9 +1,9 @@ def wrt_get_kernel_version(d):
# we dont need the kernel in the image
ROOTFS_POSTPROCESS_COMMAND += "rm -f ${IMAGE_ROOTFS}/boot/zImage*"
def wrt_get_kernel_version(d):
import bb
- if bb.data.inherits_class('image_ipk', d):
+ if bb.data.inherits_class('image', d):
skd = bb.data.getVar('STAGING_KERNEL_DIR', d, 1)
return base_read_file(skd+'/kernel-abiversion')
return "-no kernel version for available-"
============================================================
--- contrib/oe-stylize.py c259462100221e8dd5a85322a9ea080fff7989d2
+++ contrib/oe-stylize.py e6d7034ad94cfea34288bf45c49e008d2f1c3445
@@ -136,7 +136,7 @@ OE_vars = [
'INITSCRIPT_PACKAGES',
'INITSCRIPT_NAME',
'INITSCRIPT_PARAMS',
- 'IPKG_INSTALL',
+ 'PACKAGE_INSTALL',
'KERNEL_IMAGETYPE',
'KERNEL_IMAGEDEST',
'KERNEL_OUTPUT',
============================================================
--- packages/angstrom/angstrom-bootmanager-image.bb 5b58e58f9d52047634351977a81461bf2d306b37
+++ packages/angstrom/angstrom-bootmanager-image.bb d1a3baa7d2572efe426c8a091cdec5017f742fc0
@@ -7,9 +7,9 @@ export IMAGE_LINGUAS = ""
export IMAGE_BASENAME = "bootmanager-image"
export IMAGE_LINGUAS = ""
-export IPKG_INSTALL = "${RDEPENDS}"
+export PACKAGE_INSTALL = "${RDEPENDS}"
-inherit image_ipk
+inherit image
============================================================
--- packages/angstrom/angstrom-bootstrap-image.bb 2b737ec60b70df4e95c23833396e9e7d0879a530
+++ packages/angstrom/angstrom-bootstrap-image.bb 2787c637e68ff172c30b8ac0d8ca094930c122bc
@@ -12,7 +12,7 @@ export IMAGE_LINGUAS = ""
export IMAGE_BASENAME = "bootstrap-image"
export IMAGE_LINGUAS = ""
-export IPKG_INSTALL = "${RDEPENDS}"
+export PACKAGE_INSTALL = "${RDEPENDS}"
-inherit image_ipk
+inherit image
============================================================
--- packages/angstrom/angstrom-gpe-image.bb b66ea174b01b03643afb2ed9e2453791843a17f6
+++ packages/angstrom/angstrom-gpe-image.bb a8f8dca9a6c09828be3e578ff2f78bd6f0f568b5
@@ -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
-inherit image_ipk
============================================================
--- packages/images/bootstrap-image-bootchart.bb 6140fca831887bd42a3e008f0aa8abe4ccc35047
+++ packages/images/bootstrap-image-bootchart.bb d396931ba5b08f8e0867a0ebc0d369e2d306d9f6
@@ -1,10 +1,10 @@ export IMAGE_LINGUAS = ""
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"
============================================================
--- packages/images/bootstrap-image.bb f383cca522edfeeda1f619b112f0d50167230277
+++ packages/images/bootstrap-image.bb cc3959f4b48e2ccafc15824705a9405a9bfbc858
@@ -1,10 +1,10 @@ export IMAGE_LINGUAS = ""
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"
============================================================
--- packages/images/dvb-image.bb 3c10116b1a8834d23ca1cec319c8993de6659d82
+++ packages/images/dvb-image.bb 16734b11053e9265e2bbc29b4b490ac5fd4a9e6c
@@ -1,11 +1,11 @@ DVB_PACKAGES = "${MACHINE_TASK_PROVIDER}
export IMAGE_BASENAME = "dvb-image"
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"
============================================================
--- packages/images/e-image-core.bb efca432bc74a9be272be62be417882aad79526e9
+++ packages/images/e-image-core.bb 659a155c0c58b510434bacd02e80b3de3e41de7b
@@ -16,6 +16,6 @@ PREFERRED_PROVIDER_libx11 = "libx11"
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
-inherit image_ipk
============================================================
--- packages/images/e-image.bb efa790a6fb676785ec5161204f468d23f5b985ce
+++ packages/images/e-image.bb 326b9f58a409f5e386ceae400e851a72a65d9669
@@ -1,9 +1,9 @@ export IMAGE_BASENAME = "e-image"
require e-image-core.bb
DESCRIPTION = "An X11-based distribution with the Enlightenment Window Manager and Tools"
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 @@ DEPENDS += "task-e-x11-core task-gpe fig
DEPENDS += "task-e-x11-core task-gpe figment xhost gpe-soundserver gpe-confd xauth"
+RDEPENDS = "${PACKAGE_INSTALL}"
-RDEPENDS = "${IPKG_INSTALL}"
============================================================
--- packages/images/essential-image.bb 79eedf8e4c38ef318846522620b2167f2802c957
+++ packages/images/essential-image.bb ef2c15417b5ab2f5e271b8350f52d834edb490a3
@@ -15,7 +15,7 @@ PR = "r0"
######################################################################################
-inherit image_ipk
+inherit image
######################################################################################
@@ -25,4 +25,4 @@ export IMAGE_LINGUAS = ""
export IMAGE_BASENAME = "essential-image"
export IMAGE_LINGUAS = ""
+export PACKAGE_INSTALL = "task-essential-to-boot"
-export IPKG_INSTALL = "task-essential-to-boot"
============================================================
--- packages/images/essential-machine-image.bb 0b7b522eb6441de55dfa8f324f94096c4afae57b
+++ packages/images/essential-machine-image.bb d9fb64fee1695bb1a8970e99abf0a7eabca4f779
@@ -15,7 +15,7 @@ PR = "r0"
######################################################################################
-inherit image_ipk
+inherit image
######################################################################################
@@ -33,4 +33,4 @@ export IMAGE_LINGUAS = ""
export IMAGE_BASENAME = "essential-image"
export IMAGE_LINGUAS = ""
+export PACKAGE_INSTALL = "${MACHINE_TASKS}"
-export IPKG_INSTALL = "${MACHINE_TASKS}"
============================================================
--- packages/images/gpe-image.bb 48e458e7e84410f75076bc36907fc00632053d0a
+++ packages/images/gpe-image.bb fe0890aa6d4711b127027add2cb77d093a762f4b
@@ -25,9 +25,9 @@ DEPENDS = "${MACHINE_TASK_PROVIDER} task
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"
============================================================
--- packages/meta/jlime-opie.bb 3de734485f0b03a6e7d04e6a2bee28c805956552
+++ packages/images/jlime-opie.bb fb0ae30a11e9940340804481a49965ce955f27c8
@@ -17,7 +17,7 @@ INSTALL_PACKAGES = "task-bootstrap task-
task-opie-bluetooth task-opie-irda \
${extra_stuff}"
-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 @@ IMAGE_PREPROCESS_COMMAND = "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
-inherit image_ipk
============================================================
--- packages/images/maemo-image.bb a991158a91d533c6b1b11299d50d40e935158b2e
+++ packages/images/maemo-image.bb 33a2387b24aa8a75ef9b348b687f5a62eff1ee26
@@ -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"
============================================================
--- packages/images/mythfront-image.bb ccc2d1badd2a386c202369a14701124275c3e646
+++ packages/images/mythfront-image.bb 857dbcbe31f405dc5dbf8868591fe8fb13f097b0
@@ -6,8 +6,8 @@ MYTHFRONT_PACKAGES = "${MACHINE_TASK_PRO
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"
============================================================
--- packages/images/nslu2-linksys-image.bb 0bb3861a7dfaf5a003dfef6%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list