From f5b38f9db0cebb0c7c9d9d72fa98a4ff5241db20 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 20 Dec 2006 00:00:03 +0000 Subject: Remove DISTRO_TYPE, replacing with IMAGE_FEATURES. Documentation is in local.conf.sample git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1053 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/packages/dropbear/dropbear.inc | 2 + meta/packages/images/oh-image-base.bb | 2 +- meta/packages/images/oh-image-core.bb | 7 ++- meta/packages/images/oh-image-pda.bb | 10 ++-- meta/packages/images/oh-image-sdk.bb | 13 ++--- meta/packages/linux/linux-rp.inc | 2 +- meta/packages/tasks/task-oh-sdk.bb | 89 ++++++++++++++++++----------------- meta/packages/tasks/task-oh.bb | 21 +++++++-- 8 files changed, 76 insertions(+), 70 deletions(-) (limited to 'meta/packages') diff --git a/meta/packages/dropbear/dropbear.inc b/meta/packages/dropbear/dropbear.inc index 301ac24cb..19224a98e 100644 --- a/meta/packages/dropbear/dropbear.inc +++ b/meta/packages/dropbear/dropbear.inc @@ -25,6 +25,8 @@ SBINCOMMANDS = "dropbear dropbearkey dropbearconvert" BINCOMMANDS = "dbclient ssh scp" EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"' +DISTRO_TYPE = "${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)} \ + do_configure_prepend() { if [ "x${DISTRO}" != "xfamiliar" -a "${DISTRO_TYPE}" == "debug" ]; then oenote "WARNING: applying allow-nopw.patch which allows password-less logins!" diff --git a/meta/packages/images/oh-image-base.bb b/meta/packages/images/oh-image-base.bb index 4a61e7051..9b87f833e 100644 --- a/meta/packages/images/oh-image-base.bb +++ b/meta/packages/images/oh-image-base.bb @@ -4,7 +4,7 @@ export IMAGE_BASENAME = "oh-image-base" DEPENDS = "task-oh" -RDEPENDS = "task-oh-boot task-oh-boot-extras" +RDEPENDS = "${DISTRO_TASKS}" export PACKAGE_INSTALL = "${RDEPENDS}" diff --git a/meta/packages/images/oh-image-core.bb b/meta/packages/images/oh-image-core.bb index e416d8484..0e2e7d6f0 100644 --- a/meta/packages/images/oh-image-core.bb +++ b/meta/packages/images/oh-image-core.bb @@ -2,12 +2,11 @@ PR = "r0" export IMAGE_BASENAME = "oh-image-core" +IMAGE_FEATURES += "apps-core" + DEPENDS = "task-oh" -RDEPENDS = "\ - task-oh-boot \ - task-oh-boot-extras \ - task-oh-base " +RDEPENDS = "${DISTRO_TASKS}" export PACKAGE_INSTALL = "${RDEPENDS}" diff --git a/meta/packages/images/oh-image-pda.bb b/meta/packages/images/oh-image-pda.bb index d4576a0c5..b072458a3 100644 --- a/meta/packages/images/oh-image-pda.bb +++ b/meta/packages/images/oh-image-pda.bb @@ -2,15 +2,11 @@ PR = "r10" export IMAGE_BASENAME = "oh-image-pda" +IMAGE_FEATURES += "apps-core apps-pda" + DEPENDS = "task-oh" -RDEPENDS = "\ - task-oh-boot \ - task-oh-boot-extras \ - task-oh-base \ - task-oh-standard \ - ${@base_conditional("DISTRO_TYPE", "debug", "task-oh-devtools", "",d)} \ - ${@base_conditional("DISTRO_TYPE", "debug", "task-oh-testapps", "",d)} " +RDEPENDS = "${DISTRO_TASKS}" export PACKAGE_INSTALL = "${RDEPENDS}" diff --git a/meta/packages/images/oh-image-sdk.bb b/meta/packages/images/oh-image-sdk.bb index d94ce2b1d..581defb81 100644 --- a/meta/packages/images/oh-image-sdk.bb +++ b/meta/packages/images/oh-image-sdk.bb @@ -2,20 +2,13 @@ PR = "r9" export IMAGE_BASENAME = "oh-image-sdk" +IMAGE_FEATURES += "apps-core apps-pda dev-tools dev-pkgs dbg-pkgs" + DEPENDS = "\ task-oh \ task-oh-sdk" -RDEPENDS = "\ - task-oh-boot \ - task-oh-boot-extras \ - task-oh-base \ - task-oh-standard \ - task-oh-devtools \ - task-oh-testapps \ - task-oh-sdk \ - task-oh-sdk-base" - +RDEPENDS = "${DISTRO_TASKS}" export PACKAGE_INSTALL = "${RDEPENDS}" inherit image diff --git a/meta/packages/linux/linux-rp.inc b/meta/packages/linux/linux-rp.inc index ba446bdda..fe52edb68 100644 --- a/meta/packages/linux/linux-rp.inc +++ b/meta/packages/linux/linux-rp.inc @@ -27,7 +27,7 @@ CMDLINE_CON = "console=ttyS0,115200n8 console=tty1 noinitrd" CMDLINE_ROOT = "root=/dev/mtdblock2 rootfstype=jffs2" CMDLINE_ROOT_spitz = "root=/dev/hda1 rootfstype=ext3 rootdelay=1 rw" CMDLINE_OTHER = "dyntick=enable" -CMDLINE_DEBUG = '${@base_conditional("DISTRO_TYPE", "release", "quiet", "debug",d)}' +CMDLINE_DEBUG = '${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "quiet", d)}' ############################################################## # Configure memory/ramdisk split for collie diff --git a/meta/packages/tasks/task-oh-sdk.bb b/meta/packages/tasks/task-oh-sdk.bb index a14281630..ac3aaec74 100644 --- a/meta/packages/tasks/task-oh-sdk.bb +++ b/meta/packages/tasks/task-oh-sdk.bb @@ -1,10 +1,13 @@ DESCRIPTON = "Software Development Tasks for OpenedHand Poky" -PR = "r11" +PR = "r12" DEPENDS = "task-oh" ALLOW_EMPTY = "1" -PACKAGEFUNCS =+ 'generate_sdk_pkgs' +#PACKAGEFUNCS =+ 'generate_sdk_pkgs' -PACKAGES = "task-oh-sdk" +PACKAGES = "\ + task-oh-sdk \ + task-oh-sdk-dbg \ + task-oh-sdk-dev" RDEPENDS_task-oh-sdk = "\ autoconf \ @@ -19,43 +22,43 @@ RDEPENDS_task-oh-sdk = "\ pkgconfig \ distcc" -python generate_sdk_pkgs () { - ohpkgs = read_pkgdata('task-oh', d)['PACKAGES'] - pkgs = bb.data.getVar('PACKAGES', d, 1).split() - for pkg in ohpkgs.split(): - newpkg = pkg.replace('task-oh', 'task-oh-sdk') - - # for each of the task packages, add a corresponding sdk task - pkgs.append(newpkg) - - # for each sdk task, take the rdepends of the non-sdk task, and turn - # that into rrecommends upon the -dev versions of those, not unlike - # the package depchain code - spkgdata = read_subpkgdata(pkg, d) - - rdepends = explode_deps(spkgdata.get('RDEPENDS_%s' % pkg) or '') - rreclist = [] - - for depend in rdepends: - split_depend = depend.split(' (') - name = split_depend[0].strip() - if packaged('%s-dev' % name, d): - rreclist.append('%s-dev' % name) - else: - deppkgdata = read_subpkgdata(name, d) - rdepends2 = explode_deps(deppkgdata.get('RDEPENDS_%s' % name) or '') - for depend in rdepends2: - split_depend = depend.split(' (') - name = split_depend[0].strip() - if packaged('%s-dev' % name, d): - rreclist.append('%s-dev' % name) - - oldrrec = bb.data.getVar('RRECOMMENDS_%s' % newpkg, d) or '' - bb.data.setVar('RRECOMMENDS_%s' % newpkg, oldrrec + ' ' + ' '.join(rreclist), d) - # bb.note('RRECOMMENDS_%s = "%s"' % (newpkg, bb.data.getVar('RRECOMMENDS_%s' % newpkg, d))) - - # bb.note('pkgs is %s' % pkgs) - bb.data.setVar('PACKAGES', ' '.join(pkgs), d) -} - -PACKAGES_DYNAMIC = "task-oh-sdk-*" +#python generate_sdk_pkgs () { +# ohpkgs = read_pkgdata('task-oh', d)['PACKAGES'] +# pkgs = bb.data.getVar('PACKAGES', d, 1).split() +# for pkg in ohpkgs.split(): +# newpkg = pkg.replace('task-oh', 'task-oh-sdk') +# +# # for each of the task packages, add a corresponding sdk task +# pkgs.append(newpkg) +# +# # for each sdk task, take the rdepends of the non-sdk task, and turn +# # that into rrecommends upon the -dev versions of those, not unlike +# # the package depchain code +# spkgdata = read_subpkgdata(pkg, d) +# +# rdepends = explode_deps(spkgdata.get('RDEPENDS_%s' % pkg) or '') +# rreclist = [] +# +# for depend in rdepends: +# split_depend = depend.split(' (') +# name = split_depend[0].strip() +# if packaged('%s-dev' % name, d): +# rreclist.append('%s-dev' % name) +# else: +# deppkgdata = read_subpkgdata(name, d) +# rdepends2 = explode_deps(deppkgdata.get('RDEPENDS_%s' % name) or '') +# for depend in rdepends2: +# split_depend = depend.split(' (') +# name = split_depend[0].strip() +# if packaged('%s-dev' % name, d): +# rreclist.append('%s-dev' % name) +# +# oldrrec = bb.data.getVar('RRECOMMENDS_%s' % newpkg, d) or '' +# bb.data.setVar('RRECOMMENDS_%s' % newpkg, oldrrec + ' ' + ' '.join(rreclist), d) +# # bb.note('RRECOMMENDS_%s = "%s"' % (newpkg, bb.data.getVar('RRECOMMENDS_%s' % newpkg, d))) +# +# # bb.note('pkgs is %s' % pkgs) +# bb.data.setVar('PACKAGES', ' '.join(pkgs), d) +#} +# +#PACKAGES_DYNAMIC = "task-oh-sdk-*" diff --git a/meta/packages/tasks/task-oh.bb b/meta/packages/tasks/task-oh.bb index d7f9b055a..5b9ce8ce8 100644 --- a/meta/packages/tasks/task-oh.bb +++ b/meta/packages/tasks/task-oh.bb @@ -1,14 +1,28 @@ -DESCRIPTION = "Tasks for OpenedHand Poky" -PR = "r43" +pDESCRIPTION = "Tasks for OpenedHand Poky" +PR = "r44" PACKAGES = "\ task-oh-base \ + task-oh-base-dbg \ + task-oh-base-dev \ task-oh-boot \ + task-oh-boot-dbg \ + task-oh-boot-dev \ task-oh-standard \ + task-oh-standard-dbg \ + task-oh-standard-dev \ task-oh-boot-extras \ + task-oh-boot-extras-dbg \ + task-oh-boot-extras-dev \ task-oh-boot-min-extras \ + task-oh-boot-min-extras-dbg \ + task-oh-boot-min-extras-dev \ task-oh-devtools \ - task-oh-testapps" + task-oh-devtools-dbg \ + task-oh-devtools-dev \ + task-oh-testapps \ + task-oh-testapps-dbg \ + task-oh-testapps-dev" XSERVER ?= "xserver-kdrive-fbdev" @@ -29,7 +43,6 @@ RDEPENDS_task-oh-boot = "\ ipkg \ update-alternatives \ module-init-tools-depmod" -# linux-hotplug \ RDEPENDS_task-oh-boot-extras = "\ task-base" -- cgit v1.2.3