From 24aa0782880ea230c41957aedb9517583af31406 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 22 Aug 2007 15:15:51 +0000 Subject: image/rootfs_ipk: Remove uneeded mkdir calls --- classes/image.bbclass | 1 - 1 file changed, 1 deletion(-) (limited to 'classes/image.bbclass') diff --git a/classes/image.bbclass b/classes/image.bbclass index 248ccab60b..aa0c73adb7 100644 --- a/classes/image.bbclass +++ b/classes/image.bbclass @@ -71,7 +71,6 @@ fakeroot do_rootfs () { rm -rf ${IMAGE_ROOTFS} if [ "${USE_DEVFS}" != "1" ]; then - mkdir -p ${IMAGE_ROOTFS}/dev for devtable in ${@get_devtable_list(d)}; do makedevs -r ${IMAGE_ROOTFS} -D $devtable done -- cgit v1.2.3 From 681a42f0f9ed259fa6d1747f9282044d5b799ef4 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 22 Aug 2007 16:14:59 +0000 Subject: image.bbclass: Add the mkdir back in a different form. This proves nobody uses USE_DEVFS and we should consider removing it, --- classes/image.bbclass | 1 + 1 file changed, 1 insertion(+) (limited to 'classes/image.bbclass') diff --git a/classes/image.bbclass b/classes/image.bbclass index aa0c73adb7..91e63262cd 100644 --- a/classes/image.bbclass +++ b/classes/image.bbclass @@ -69,6 +69,7 @@ do_build[nostamp] = "1" fakeroot do_rootfs () { set -x rm -rf ${IMAGE_ROOTFS} + mkdir -p ${IMAGE_ROOTFS} if [ "${USE_DEVFS}" != "1" ]; then for devtable in ${@get_devtable_list(d)}; do -- cgit v1.2.3 From 3aded69ae48453e4929d42994c9f66abcb2dd47e Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 30 Aug 2007 07:23:50 +0000 Subject: classes: Remove bitbake 1.6 compatibility code --- classes/image.bbclass | 1 - 1 file changed, 1 deletion(-) (limited to 'classes/image.bbclass') diff --git a/classes/image.bbclass b/classes/image.bbclass index 91e63262cd..38e19df7eb 100644 --- a/classes/image.bbclass +++ b/classes/image.bbclass @@ -3,7 +3,6 @@ inherit rootfs_${IMAGE_PKGTYPE} PACKAGES = "" # We need to recursively follow RDEPENDS and RRECOMMENDS for images -BUILD_ALL_DEPS = "1" do_rootfs[recrdeptask] = "do_package_write do_deploy do_populate_staging" # Images are generally built explicitly, do not need to be part of world. -- cgit v1.2.3 From 344ad5e784560c0e88bc8c73ee6fcc2d96e1f56d Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 1 Sep 2007 16:57:37 +0000 Subject: images: Clean up image .bb files, moving functionality to image.bbclass (LICENCE default, setup of RDEPENDS and default IMAGE_BASENAME) --- classes/image.bbclass | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'classes/image.bbclass') diff --git a/classes/image.bbclass b/classes/image.bbclass index 38e19df7eb..c1eaf9ffe2 100644 --- a/classes/image.bbclass +++ b/classes/image.bbclass @@ -1,6 +1,11 @@ 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 @@ def get_devtable_list(d): 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" -- cgit v1.2.3 From 5d6952960f72d834c5f350055a2a07ed4d98ef84 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 1 Sep 2007 17:07:36 +0000 Subject: image.bbclass: Append to do_rootfs[recrdeptask] --- classes/image.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes/image.bbclass') diff --git a/classes/image.bbclass b/classes/image.bbclass index c1eaf9ffe2..04e26e4b35 100644 --- a/classes/image.bbclass +++ b/classes/image.bbclass @@ -8,7 +8,7 @@ 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" +do_rootfs[recrdeptask] += "do_deploy do_populate_staging" # Images are generally built explicitly, do not need to be part of world. EXCLUDE_FROM_WORLD = "1" -- cgit v1.2.3 From a0cdc9273d0d04c9adb075850206f7634d3658b9 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 5 Sep 2007 08:29:48 +0000 Subject: bitbake.conf/image.bbclass: Set IMAGE_BASENAME to a better default and export correctly, add BZR fetcher config (from poky) --- classes/image.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes/image.bbclass') diff --git a/classes/image.bbclass b/classes/image.bbclass index 04e26e4b35..3420e3f53a 100644 --- a/classes/image.bbclass +++ b/classes/image.bbclass @@ -4,7 +4,7 @@ LICENSE = "MIT" PACKAGES = "" RDEPENDS += "${IMAGE_INSTALL}" -export IMAGE_BASENAME ?= "${PN}" +IMAGE_BASENAME[export] = "1" export PACKAGE_INSTALL ?= "${IMAGE_INSTALL}" # We need to recursively follow RDEPENDS and RRECOMMENDS for images -- cgit v1.2.3