[oe-commits] org.oe.dev images: Clean up image .bb files, moving functionality to image.bbclass (LICENCE default, setup of RDEPENDS and default IMAGE_BASENAME)

rpurdie commit openembedded-commits at lists.openembedded.org
Sat Sep 1 19:07:14 UTC 2007


images: Clean up image .bb files, moving functionality to image.bbclass (LICENCE default, setup of RDEPENDS and default IMAGE_BASENAME)

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 1d4fc7d0fa089ad996e3559486de14bde52a3fd4
ViewMTN: http://monotone.openembedded.org/revision.psp?id=1d4fc7d0fa089ad996e3559486de14bde52a3fd4
Files:
1
classes/image.bbclass
packages/angstrom/angstrom-bootmanager-image.bb
packages/angstrom/angstrom-console-image.bb
packages/angstrom/angstrom-gateway-image.bb
packages/angstrom/angstrom-mokogateway-image.bb
packages/angstrom/angstrom-x11-gpe-image.bb
packages/angstrom/angstrom-x11-image.bb
packages/angstrom/angstrom-x11-office-image.bb
packages/angstrom/angstrom-x11-pimlico-image.bb
packages/images/angstrom-minimal-image.bb
packages/images/bootstrap-image-bootchart.bb
packages/images/bootstrap-image.bb
packages/images/devimage-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-blank-user.bb
packages/images/gpe-image.bb
packages/images/gpephone-image-vm.bb
packages/images/gpephone-image.bb
packages/images/helloworld-image.bb
packages/images/initramfs-image.bb
packages/images/initramfs-minimal-image.bb
packages/images/jlime-opie.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-extended.bb
packages/images/nylon-image-extra.bb
packages/images/nylon-image-mini.bb
packages/images/nylon-image-standard.bb
packages/images/openmoko-devel-image.bb
packages/images/openmoko-image.bb
packages/images/openmoko-sdk-image.bb
packages/images/openprotium-image.bb
packages/images/opie-image-16mb.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/nonworking/angstrom/angstrom-e-image.bb
Diffs:

#
# mt diff -r91de550a1c02ceef65f1158e9dab3d27b32d8df9 -r1d4fc7d0fa089ad996e3559486de14bde52a3fd4
#
# 
# 
# patch "classes/image.bbclass"
#  from [9ce7e97fa49142c8e94930461f94af3ec3c18110]
#    to [a24e0b01af61e7bc076253865311194aeabad28b]
# 
# patch "packages/angstrom/angstrom-bootmanager-image.bb"
#  from [d1a3baa7d2572efe426c8a091cdec5017f742fc0]
#    to [2e84f2e4e13e55c8f699a445bf9dc205ed33e965]
# 
# patch "packages/angstrom/angstrom-console-image.bb"
#  from [e642f25712e1191f9671d162c09fd492a85400bc]
#    to [935450894690e109439d4565572d813671a85699]
# 
# patch "packages/angstrom/angstrom-gateway-image.bb"
#  from [0d28af15cf07cfbde7e6a5b3c5f6c40800846eff]
#    to [ce18fb7ee4122aa54cc0eec2623dc2fc0deda017]
# 
# patch "packages/angstrom/angstrom-mokogateway-image.bb"
#  from [392588d433be0b9582d92f0f4db2cf01a9e967f3]
#    to [d79e0a3bee7183b521cdf2a2f55bf638a3b55be8]
# 
# patch "packages/angstrom/angstrom-x11-gpe-image.bb"
#  from [ef05cb17a109e1bfa5527107b64ac54ac48d3b59]
#    to [c8543db52c9f3b3793372a91e5c2d807fe31ca3b]
# 
# patch "packages/angstrom/angstrom-x11-image.bb"
#  from [72ac30a3a1a9a6405bfbb3ec0914d706d5e61d82]
#    to [340f91d6bae38bceb8a159ca15f7d303d7188b3e]
# 
# patch "packages/angstrom/angstrom-x11-office-image.bb"
#  from [c3ed81e0ddbf8343fd79debe9634750f56e9c89d]
#    to [396fb20d63dee90a6a41f8ed68f8fc1580bdd778]
# 
# patch "packages/angstrom/angstrom-x11-pimlico-image.bb"
#  from [591a09b2439c2a10852348e51cc711372a903144]
#    to [42401d25b63f709c0357a47f1c22ab27004ab097]
# 
# patch "packages/images/angstrom-minimal-image.bb"
#  from [18997ce3f1ed2ef3216d3518a98aade1078e00de]
#    to [c74056146aaed6f3e2cd64879f504ea6920efb59]
# 
# patch "packages/images/bootstrap-image-bootchart.bb"
#  from [d396931ba5b08f8e0867a0ebc0d369e2d306d9f6]
#    to [f2bbfe865bcebcf4fb84a48dc5a0fa6d2c1cbc1a]
# 
# patch "packages/images/bootstrap-image.bb"
#  from [9ecc0265b971454b5482330c5130c5201492b190]
#    to [15117201e2baccd59639cbc33f28a0fc4c280d5a]
# 
# patch "packages/images/devimage-image.bb"
#  from [c36b2b99ac445dcaf5b0c56269ba22ed9f01f062]
#    to [0ad21673974579715377822a74cb6ea99dc0b14a]
# 
# patch "packages/images/dvb-image.bb"
#  from [16734b11053e9265e2bbc29b4b490ac5fd4a9e6c]
#    to [feda66d8e6142b4c4cd2c4d19d67abdfb15d46b3]
# 
# patch "packages/images/e-image-core.bb"
#  from [659a155c0c58b510434bacd02e80b3de3e41de7b]
#    to [2f89f94c9e5bb901017ea12bb634dab6cfdb11c5]
# 
# patch "packages/images/e-image.bb"
#  from [335b0fd609b4b88b8939987c8e319d1b19d6c062]
#    to [6a88d88a9acff0a0c48e3f19d949722c985aa5be]
# 
# patch "packages/images/essential-image.bb"
#  from [b2d46113d5527027937bbf018e3362c2878579ce]
#    to [8c7a5a0e09773a8a7a1c89831407b317bbbc11a3]
# 
# patch "packages/images/essential-machine-image.bb"
#  from [4dfd3d136a46a77b325d6d9d36a483890ec54ab1]
#    to [d48d0500f115db2f4fea77f51eea4460fbeb0a36]
# 
# patch "packages/images/gpe-image-blank-user.bb"
#  from [def660611d195743449911603d19d0319cbc7fa8]
#    to [f6f543d1909dcf24b5c53357ba31ba8e8c9525b3]
# 
# patch "packages/images/gpe-image.bb"
#  from [4cb5b4abe319688775fba3e25151dc345ce518a8]
#    to [f2c76eb0405a24116e75d07e0c6602fb6ad24fd9]
# 
# patch "packages/images/gpephone-image-vm.bb"
#  from [75f6562087c006a96cb057109a664f4001f8eca7]
#    to [0167c4dcc98b7eb9cfcc88c6f5d9c13fc339b30e]
# 
# patch "packages/images/gpephone-image.bb"
#  from [8855d0036a5e84a843aafd5b38afd35843e4d76e]
#    to [9533ae73f73f2cef3a057b581e2fdeb0fed85426]
# 
# patch "packages/images/helloworld-image.bb"
#  from [62d0dfb6cdd494db5b4731b74f5f3a4a92f0a119]
#    to [b83c6b949ae1bc6d30732697e16978ec96e207f8]
# 
# patch "packages/images/initramfs-image.bb"
#  from [58e79ba3a3834ad8830c0866be9d5e351880e916]
#    to [16330772de554a7ddfd102c78519476ac56c84bd]
# 
# patch "packages/images/initramfs-minimal-image.bb"
#  from [93795104d3a49aec178fec7662a11a453edacee9]
#    to [06a49c2ea305fe2ab0ea3fd38e08c81dcd675500]
# 
# patch "packages/images/jlime-opie.bb"
#  from [fb0ae30a11e9940340804481a49965ce955f27c8]
#    to [5adb8e09ea07ccb582513379a3272fe6813c04c4]
# 
# patch "packages/images/maemo-image.bb"
#  from [38b7c055e0d748a31f8fe2a0dbee151a01015197]
#    to [a9624c71e754ab36fbe47b3b0b6a1bd719117d05]
# 
# patch "packages/images/mythfront-image.bb"
#  from [857dbcbe31f405dc5dbf8868591fe8fb13f097b0]
#    to [48bc732d8384950f3cb2939b909cba16e0a72c74]
# 
# patch "packages/images/nslu2-linksys-image.bb"
#  from [c36ef190014a7d7ea8066f036c2a6bbc81c52f12]
#    to [dd5a92d8f5edc12b7c7bb99d7c121921c46f8d40]
# 
# patch "packages/images/nylon-image-base.bb"
#  from [e62cc38191137aa875eb2190497d2eef7d718afb]
#    to [72121001960a9d439e4b356daf2fffa7b6732fb2]
# 
# patch "packages/images/nylon-image-extended.bb"
#  from [0390e05099b2ae84d6027fed8d7375e6f766d57a]
#    to [091a9c2aa97c837f18dfa9ebf9d7effeebbb175a]
# 
# patch "packages/images/nylon-image-extra.bb"
#  from [838bc55bcd2b847574d459b88d9b8fd8f8b38cfa]
#    to [75bd98b145feca2a61342a917deb1920bb2fb91c]
# 
# patch "packages/images/nylon-image-mini.bb"
#  from [fa47a8388a5cdf939a7afd5a103890b2aee7dc14]
#    to [0335ce21055c0a6589a1af2c0eb682c2da39a1e5]
# 
# patch "packages/images/nylon-image-standard.bb"
#  from [0540e4923fa63013c7896a663072e93840f0eeaf]
#    to [a5880b59318a1fa133cf0ca74233d0e575e37179]
# 
# patch "packages/images/openmoko-devel-image.bb"
#  from [bb656d3436f7ee0e279febc18b64f72d1a329c5d]
#    to [bc0401d66feb544f13b6c63e6ce1c48a11ad73ba]
# 
# patch "packages/images/openmoko-image.bb"
#  from [97b5722f7eef6ce6117016cc573067e30da5f2ee]
#    to [27d8c08338a94022bf82abaf47e4cb3564893958]
# 
# patch "packages/images/openmoko-sdk-image.bb"
#  from [76a888c6303ad27c5ddc0893430df0492e4a375e]
#    to [9f8e0d1ff8b5ec36535b0122bafd1efe0563a5f0]
# 
# patch "packages/images/openprotium-image.bb"
#  from [b8fcbe3a228e05dae5d6343193ed4e38dbaf367d]
#    to [738026dd8e8a9e3fe4c7be21ad6fad4da91da8a3]
# 
# patch "packages/images/opie-image-16mb.bb"
#  from [3961c821470050fd70488a1688a142f074ae5a4a]
#    to [3a0a66249e372569c26b37c7367ab42831e5d656]
# 
# patch "packages/images/opie-image.bb"
#  from [6e82664c5e048a6ace172b1590aec6a3be929657]
#    to [eab510fa58a1cbe34c8c15ea7cacb18bf5bd9d92]
# 
# patch "packages/images/opie-kdepim-image.bb"
#  from [8696dabcc257470994a6098f36e85d94398fda7f]
#    to [b3f89f0bf576b3087519b8bf0575f0c778f566db]
# 
# patch "packages/images/ossie-image.bb"
#  from [b95d3bed33d2e1c5b580842fb3dd52456a12ff10]
#    to [d5dca67a2650abe5091a8b2c081276ade998dbf9]
# 
# patch "packages/images/pivotboot-image.bb"
#  from [61ceb02faed3ae93dcb1a48b9aa73db239469374]
#    to [931d01aceb55db75f92ae51399ef1b8f93cceac0]
# 
# patch "packages/images/sdl-image.bb"
#  from [cb3d6b0a957444e5eefe63c10a0d0b69f5809aef]
#    to [448ead56dfe59a356dcfaf77c82ebbea11a48c6b]
# 
# patch "packages/images/sectest-gpe-image.bb"
#  from [1c5026331d2a81d6fe7ec10af95879d45e4b36e6]
#    to [ccab1840c4f2c5467193df5f70ecf3452bdbb7b6]
# 
# patch "packages/images/slugos-image.bb"
#  from [950005936dcfec1fac4a45eb6a5e74226ac2d3da]
#    to [5fa0b69b4da806b2db1bcf584aac9b8668a1dc94]
# 
# patch "packages/images/twin-image.bb"
#  from [d1caa569fe0e916bb5abf973b4c4aa2d27f30b82]
#    to [e61b77cfaae4f71f1664fcb8803495f940d1cdfe]
# 
# patch "packages/images/uml-image.bb"
#  from [8ae454a01f633c2b15ab5aa755c67833fbb683c0]
#    to [391e74714e87b8beb2a540b6ed0430fcfb1ba214]
# 
# patch "packages/images/unslung-image.bb"
#  from [c3dafe53a4d27e373db9edc06a36d4ee74867f33]
#    to [c72989e4cd7c8c0eefabc8565d48d7662ce01c37]
# 
# patch "packages/images/xfce-image.bb"
#  from [34c5542022b798ed05fb9ee9b4110c9dac68897c]
#    to [3962da7aedbaf23a7114e99496fac8550b5834dc]
# 
# patch "packages/images/xterminal-image.bb"
#  from [9d5a82244519310685a1f59dc69dae7fc6806f42]
#    to [9778de55055ea44a2f2d22f8f7d70aae7b76fdd1]
# 
# patch "packages/nonworking/angstrom/angstrom-e-image.bb"
#  from [f173fa7b8ce59082d4399b1ea1f88269b4befca7]
#    to [86281d61f887f49d628dc5f2bfc7d62e34345a27]
# 
============================================================
--- classes/image.bbclass	9ce7e97fa49142c8e94930461f94af3ec3c18110
+++ classes/image.bbclass	a24e0b01af61e7bc076253865311194aeabad28b
@@ -1,7 +1,12 @@ inherit rootfs_${IMAGE_PKGTYPE}
 inherit rootfs_${IMAGE_PKGTYPE}
 
+LICENSE = "MIT"
 PACKAGES = ""
+RDEPENDS += "${IMAGE_INSTALL}"
 
+export IMAGE_BASENAME ?= "${PN}"
+export PACKAGE_INSTALL ?= "${IMAGE_INSTALL}"
+
 # We need to recursively follow RDEPENDS and RRECOMMENDS for images
 do_rootfs[recrdeptask] = "do_package_write do_deploy do_populate_staging"
 
@@ -50,15 +55,14 @@ IMAGE_POSTPROCESS_COMMAND ?= ""
 	return str
 
 IMAGE_POSTPROCESS_COMMAND ?= ""
+MACHINE_POSTPROCESS_COMMAND ?= ""
+ROOTFS_POSTPROCESS_COMMAND ?= ""
 
 # some default locales
 IMAGE_LINGUAS ?= "de-de fr-fr en-gb"
 
 LINGUAS_INSTALL = "${@" ".join(map(lambda s: "locale-base-%s" % s, bb.data.getVar('IMAGE_LINGUAS', d, 1).split()))}"
 
-ROOTFS_POSTPROCESS_COMMAND ?= ""
-MACHINE_POSTPROCESS_COMMAND ?= ""
-
 do_rootfs[nostamp] = "1"
 do_rootfs[dirs] = "${TOPDIR}"
 do_build[nostamp] = "1"
============================================================
--- packages/angstrom/angstrom-bootmanager-image.bb	d1a3baa7d2572efe426c8a091cdec5017f742fc0
+++ packages/angstrom/angstrom-bootmanager-image.bb	2e84f2e4e13e55c8f699a445bf9dc205ed33e965
@@ -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
 
============================================================
--- packages/angstrom/angstrom-console-image.bb	e642f25712e1191f9671d162c09fd492a85400bc
+++ packages/angstrom/angstrom-console-image.bb	935450894690e109439d4565572d813671a85699
@@ -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
 
============================================================
--- packages/angstrom/angstrom-gateway-image.bb	0d28af15cf07cfbde7e6a5b3c5f6c40800846eff
+++ packages/angstrom/angstrom-gateway-image.bb	ce18fb7ee4122aa54cc0eec2623dc2fc0deda017
@@ -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 @@ export IMAGE_BASENAME = "gateway-image"
 	   "
 
 export IMAGE_BASENAME = "gateway-image"
-export IMAGE_LINGUAS = ""
-export PACKAGE_INSTALL = "${RDEPENDS}"
+IMAGE_LINGUAS = ""
 
 inherit image
 
============================================================
--- packages/angstrom/angstrom-mokogateway-image.bb	392588d433be0b9582d92f0f4db2cf01a9e967f3
+++ packages/angstrom/angstrom-mokogateway-image.bb	d79e0a3bee7183b521cdf2a2f55bf638a3b55be8
@@ -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
 
============================================================
--- packages/angstrom/angstrom-x11-gpe-image.bb	ef05cb17a109e1bfa5527107b64ac54ac48d3b59
+++ packages/angstrom/angstrom-x11-gpe-image.bb	c8543db52c9f3b3793372a91e5c2d807fe31ca3b
@@ -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 @@ DEPENDS = "task-base"
 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)}'
 
============================================================
--- packages/angstrom/angstrom-x11-image.bb	72ac30a3a1a9a6405bfbb3ec0914d706d5e61d82
+++ packages/angstrom/angstrom-x11-image.bb	340f91d6bae38bceb8a159ca15f7d303d7188b3e
@@ -1,6 +1,4 @@
 #Angstrom X11 image
-LICENSE = "MIT"
-PR = "r11"
 
 PREFERRED_PROVIDER_libgpewidget 	?= "libgpewidget"
 PREFERRED_PROVIDER_tslib 		?= "tslib"
@@ -16,7 +14,7 @@ DEPENDS = "task-base"
 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)}'
 
============================================================
--- packages/angstrom/angstrom-x11-office-image.bb	c3ed81e0ddbf8343fd79debe9634750f56e9c89d
+++ packages/angstrom/angstrom-x11-office-image.bb	396fb20d63dee90a6a41f8ed68f8fc1580bdd778
@@ -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 @@ DEPENDS = "task-base"
 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)}'
 
============================================================
--- packages/angstrom/angstrom-x11-pimlico-image.bb	591a09b2439c2a10852348e51cc711372a903144
+++ packages/angstrom/angstrom-x11-pimlico-image.bb	42401d25b63f709c0357a47f1c22ab27004ab097
@@ -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 @@ DEPENDS = "task-base"
 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)}'
 
============================================================
--- packages/images/angstrom-minimal-image.bb	18997ce3f1ed2ef3216d3518a98aade1078e00de
+++ packages/images/angstrom-minimal-image.bb	c74056146aaed6f3e2cd64879f504ea6920efb59
@@ -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
 
==========================================%s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list