diff options
| author |   Richard Purdie <rpurdie@rpsys.net> | 2006-12-31 23:28:56 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@rpsys.net> | 2006-12-31 23:28:56 +0000 |
| commit | a7c7d20784667526ec3fce58da7efe2b415aa884 (patch) | |
| tree | 73c22c96396d8f235b49a0da712a9d9d04e377a9 /classes | |
| parent | 9bd213b23e9095cc0aa94952cc345a110a5cdc40 (diff) | |
| download | openembedded-a7c7d20784667526ec3fce58da7efe2b415aa884.tar.gz | |
Rename: image_ipk -> image.bbclass, IPKG_INSTALL -> PACKAGE_INSTALL to prepare for deb packaging
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/image.bbclass (renamed from classes/image_ipk.bbclass) | 0 | ||||
| -rw-r--r-- | classes/rootfs_ipk.bbclass | 8 | ||||
| -rw-r--r-- | classes/wrt-image.bbclass | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/classes/image_ipk.bbclass b/classes/image.bbclass index 2beb137aef..2beb137aef 100644 --- a/classes/image_ipk.bbclass +++ b/classes/image.bbclass diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass index 8020fd0ca3..9af23c7a73 100644 --- a/classes/rootfs_ipk.bbclass +++ b/classes/rootfs_ipk.bbclass @@ -2,7 +2,7 @@ # 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 @@ do_build[nostamp] = "1" 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} diff --git a/classes/wrt-image.bbclass b/classes/wrt-image.bbclass index ba1163a719..45d9ac923f 100644 --- a/classes/wrt-image.bbclass +++ b/classes/wrt-image.bbclass @@ -3,7 +3,7 @@ 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-" |