summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build/conf/local.conf.sample21
-rw-r--r--meta/classes/base.bbclass17
-rw-r--r--meta/conf/distro/poky.conf28
-rw-r--r--meta/packages/dropbear/dropbear.inc2
-rw-r--r--meta/packages/images/oh-image-base.bb2
-rw-r--r--meta/packages/images/oh-image-core.bb7
-rw-r--r--meta/packages/images/oh-image-pda.bb10
-rw-r--r--meta/packages/images/oh-image-sdk.bb13
-rw-r--r--meta/packages/linux/linux-rp.inc2
-rw-r--r--meta/packages/tasks/task-oh-sdk.bb89
-rw-r--r--meta/packages/tasks/task-oh.bb21
11 files changed, 128 insertions, 84 deletions
diff --git a/build/conf/local.conf.sample b/build/conf/local.conf.sample
index 9fb83dc378..e5d14301b4 100644
--- a/build/conf/local.conf.sample
+++ b/build/conf/local.conf.sample
@@ -28,12 +28,21 @@ DISTRO = "poky"
28# For bleeding edge / experimental / unstable package versions 28# For bleeding edge / experimental / unstable package versions
29# DISTRO = "poky-bleeding" 29# DISTRO = "poky-bleeding"
30 30
31# DISTRO_TYPE determines the type of images that will be built 31# IMAGE_FEATURES configuration of the generated images
32# "release" - create a streamlined and secure image 32# (Some of these are automatically added to certain image types)
33# "debug" - enable easier ssh access 33# "dev-pkgs" - add -dev packages for all installed packages
34# - include the devtools and testapps packages 34# (useful if you want to develop against libs in the image)
35 35# "dbg-pkgs" - add -dbg packages for all installed packages
36DISTRO_TYPE = "debug" 36# (adds symbol information for debugging/profiling)
37# "apps-core" - core applications
38# "apps-pda" - add PDA application suite (contacts, dates, etc.)
39# "dev-tools" - add development tools (gcc, make, pkgconfig etc.)
40# "dbg-tools" - add debugging tools (gdb, strace, oprofile, etc.)
41# "test-tools" - add useful testing tools (ts_print, aplay, arecord etc.)
42# "debug-tweaks" - make an image for suitable of development
43# e.g. ssh root access has a blank password
44
45IMAGE_FEATURES = "dbg-tools test-tools debug-tweaks"
37 46
38# A list of packaging systems used in generated images 47# A list of packaging systems used in generated images
39# The first package type listed will be used for rootfs generation 48# The first package type listed will be used for rootfs generation
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index e7725b7443..e08a2be2d2 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -41,12 +41,17 @@ def base_conditional(variable, checkvalue, truevalue, falsevalue, d):
41 else: 41 else:
42 return falsevalue 42 return falsevalue
43 43
44def base_contains(variable, checkvalue, truevalue, falsevalue, d): 44def base_contains(variable, checkvalues, truevalue, falsevalue, d):
45 import bb 45 import bb
46 if bb.data.getVar(variable,d,1).find(checkvalue) != -1: 46 matches = 0
47 return truevalue 47 if type(checkvalues).__name__ == "str":
48 else: 48 checkvalues = [checkvalues]
49 return falsevalue 49 for value in checkvalues:
50 if bb.data.getVar(variable,d,1).find(value) != -1:
51 matches = matches + 1
52 if matches == len(checkvalues):
53 return truevalue
54 return falsevalue
50 55
51def base_both_contain(variable1, variable2, checkvalue, d): 56def base_both_contain(variable1, variable2, checkvalue, d):
52 import bb 57 import bb
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index d42f59289a..f57c07d3fd 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -5,8 +5,6 @@ DISTRO = "poky"
5DISTRO_NAME = "OpenedHand Linux (Poky)" 5DISTRO_NAME = "OpenedHand Linux (Poky)"
6DISTRO_VERSION = "0.0-snapshot-${DATE}" 6DISTRO_VERSION = "0.0-snapshot-${DATE}"
7 7
8DISTRO_TYPE ?= "release"
9
10MAINTAINER = "OpenedHand <poky@openedhand.com>" 8MAINTAINER = "OpenedHand <poky@openedhand.com>"
11 9
12PACKAGE_CLASSES ?= "package_ipk" 10PACKAGE_CLASSES ?= "package_ipk"
@@ -186,3 +184,29 @@ DISTRO_FEATURES = "alsa bluetooth ext2 irda pcmcia usbgadget usbhost wifi"
186DISTRO_FEATURES_cmx270 = "alsa bluetooth ext2 irda pcmcia usbgadget usbhost" 184DISTRO_FEATURES_cmx270 = "alsa bluetooth ext2 irda pcmcia usbgadget usbhost"
187DISTRO_EXTRA_RDEPENDS_qemuarm += "qemu-distcc" 185DISTRO_EXTRA_RDEPENDS_qemuarm += "qemu-distcc"
188DISTRO_EXTRA_RDEPENDS_qemux86 += "qemu-distcc" 186DISTRO_EXTRA_RDEPENDS_qemux86 += "qemu-distcc"
187
188IMAGE_FEATURES ?= ""
189
190DISTRO_TASKS = "\
191 task-oh-boot \
192 ${@base_contains("IMAGE_FEATURES", "dbg-pkgs", "task-oh-boot-dbg", "",d)} \
193 ${@base_contains("IMAGE_FEATURES", "dev-pkgs", "task-oh-boot-dev", "",d)} \
194 task-oh-boot-extras \
195 ${@base_contains("IMAGE_FEATURES", "dbg-pkgs", "task-oh-boot-extras-dbg", "",d)} \
196 ${@base_contains("IMAGE_FEATURES", "dev-pkgs", "task-oh-boot-extras-dev", "",d)} \
197 ${@base_contains("IMAGE_FEATURES", "apps-core", "task-oh-base", "",d)} \
198 ${@base_contains("IMAGE_FEATURES", ["apps-core", "dbg-pkgs"], "task-oh-base-dbg", "",d)} \
199 ${@base_contains("IMAGE_FEATURES", ["apps-core", "dev-pkgs"], "task-oh-base-dev", "",d)} \
200 ${@base_contains("IMAGE_FEATURES", "apps-pda", "task-oh-standard", "",d)} \
201 ${@base_contains("IMAGE_FEATURES", ["apps-pda", "dbg-pkgs"], "task-oh-standard-dbg", "",d)} \
202 ${@base_contains("IMAGE_FEATURES", ["apps-pda", "dev-pkgs"], "task-oh-standard-dev", "",d)} \
203 ${@base_contains("IMAGE_FEATURES", "dev-tools", "task-oh-sdk", "",d)} \
204 ${@base_contains("IMAGE_FEATURES", ["dev-tools", "dbg-pkgs"], "task-oh-sdk-dbg", "",d)} \
205 ${@base_contains("IMAGE_FEATURES", ["dev-tools", "dev-pkgs"], "task-oh-sdk-dev", "",d)} \
206 ${@base_contains("IMAGE_FEATURES", "dbg-tools", "task-oh-devtools", "",d)} \
207 ${@base_contains("IMAGE_FEATURES", ["dbg-tools", "dbg-pkgs"], "task-oh-devtools-dbg", "",d)} \
208 ${@base_contains("IMAGE_FEATURES", ["dbg-tools", "dev-pkgs"], "task-oh-devtools-dev", "",d)} \
209 ${@base_contains("IMAGE_FEATURES", "test-tools", "task-oh-testapps", "",d)} \
210 ${@base_contains("IMAGE_FEATURES", ["test-tools", "dbg-pkgs"], "task-oh-testapps-dbg", "",d)} \
211 ${@base_contains("IMAGE_FEATURES", ["test-tools", "dev-pkgs"], "task-oh-testapps-dev", "",d)} \
212 "
diff --git a/meta/packages/dropbear/dropbear.inc b/meta/packages/dropbear/dropbear.inc
index 301ac24cb2..19224a98e9 100644
--- a/meta/packages/dropbear/dropbear.inc
+++ b/meta/packages/dropbear/dropbear.inc
@@ -25,6 +25,8 @@ SBINCOMMANDS = "dropbear dropbearkey dropbearconvert"
25BINCOMMANDS = "dbclient ssh scp" 25BINCOMMANDS = "dbclient ssh scp"
26EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"' 26EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"'
27 27
28DISTRO_TYPE = "${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)} \
29
28do_configure_prepend() { 30do_configure_prepend() {
29 if [ "x${DISTRO}" != "xfamiliar" -a "${DISTRO_TYPE}" == "debug" ]; then 31 if [ "x${DISTRO}" != "xfamiliar" -a "${DISTRO_TYPE}" == "debug" ]; then
30 oenote "WARNING: applying allow-nopw.patch which allows password-less logins!" 32 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 4a61e70519..9b87f833e8 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"
4 4
5DEPENDS = "task-oh" 5DEPENDS = "task-oh"
6 6
7RDEPENDS = "task-oh-boot task-oh-boot-extras" 7RDEPENDS = "${DISTRO_TASKS}"
8 8
9export PACKAGE_INSTALL = "${RDEPENDS}" 9export PACKAGE_INSTALL = "${RDEPENDS}"
10 10
diff --git a/meta/packages/images/oh-image-core.bb b/meta/packages/images/oh-image-core.bb
index e416d84843..0e2e7d6f0d 100644
--- a/meta/packages/images/oh-image-core.bb
+++ b/meta/packages/images/oh-image-core.bb
@@ -2,12 +2,11 @@ PR = "r0"
2 2
3export IMAGE_BASENAME = "oh-image-core" 3export IMAGE_BASENAME = "oh-image-core"
4 4
5IMAGE_FEATURES += "apps-core"
6
5DEPENDS = "task-oh" 7DEPENDS = "task-oh"
6 8
7RDEPENDS = "\ 9RDEPENDS = "${DISTRO_TASKS}"
8 task-oh-boot \
9 task-oh-boot-extras \
10 task-oh-base "
11 10
12export PACKAGE_INSTALL = "${RDEPENDS}" 11export PACKAGE_INSTALL = "${RDEPENDS}"
13 12
diff --git a/meta/packages/images/oh-image-pda.bb b/meta/packages/images/oh-image-pda.bb
index d4576a0c55..b072458a36 100644
--- a/meta/packages/images/oh-image-pda.bb
+++ b/meta/packages/images/oh-image-pda.bb
@@ -2,15 +2,11 @@ PR = "r10"
2 2
3export IMAGE_BASENAME = "oh-image-pda" 3export IMAGE_BASENAME = "oh-image-pda"
4 4
5IMAGE_FEATURES += "apps-core apps-pda"
6
5DEPENDS = "task-oh" 7DEPENDS = "task-oh"
6 8
7RDEPENDS = "\ 9RDEPENDS = "${DISTRO_TASKS}"
8 task-oh-boot \
9 task-oh-boot-extras \
10 task-oh-base \
11 task-oh-standard \
12 ${@base_conditional("DISTRO_TYPE", "debug", "task-oh-devtools", "",d)} \
13 ${@base_conditional("DISTRO_TYPE", "debug", "task-oh-testapps", "",d)} "
14 10
15export PACKAGE_INSTALL = "${RDEPENDS}" 11export PACKAGE_INSTALL = "${RDEPENDS}"
16 12
diff --git a/meta/packages/images/oh-image-sdk.bb b/meta/packages/images/oh-image-sdk.bb
index d94ce2b1d4..581defb816 100644
--- a/meta/packages/images/oh-image-sdk.bb
+++ b/meta/packages/images/oh-image-sdk.bb
@@ -2,20 +2,13 @@ PR = "r9"
2 2
3export IMAGE_BASENAME = "oh-image-sdk" 3export IMAGE_BASENAME = "oh-image-sdk"
4 4
5IMAGE_FEATURES += "apps-core apps-pda dev-tools dev-pkgs dbg-pkgs"
6
5DEPENDS = "\ 7DEPENDS = "\
6 task-oh \ 8 task-oh \
7 task-oh-sdk" 9 task-oh-sdk"
8 10
9RDEPENDS = "\ 11RDEPENDS = "${DISTRO_TASKS}"
10 task-oh-boot \
11 task-oh-boot-extras \
12 task-oh-base \
13 task-oh-standard \
14 task-oh-devtools \
15 task-oh-testapps \
16 task-oh-sdk \
17 task-oh-sdk-base"
18
19export PACKAGE_INSTALL = "${RDEPENDS}" 12export PACKAGE_INSTALL = "${RDEPENDS}"
20 13
21inherit image 14inherit image
diff --git a/meta/packages/linux/linux-rp.inc b/meta/packages/linux/linux-rp.inc
index ba446bdda5..fe52edb68f 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"
27CMDLINE_ROOT = "root=/dev/mtdblock2 rootfstype=jffs2" 27CMDLINE_ROOT = "root=/dev/mtdblock2 rootfstype=jffs2"
28CMDLINE_ROOT_spitz = "root=/dev/hda1 rootfstype=ext3 rootdelay=1 rw" 28CMDLINE_ROOT_spitz = "root=/dev/hda1 rootfstype=ext3 rootdelay=1 rw"
29CMDLINE_OTHER = "dyntick=enable" 29CMDLINE_OTHER = "dyntick=enable"
30CMDLINE_DEBUG = '${@base_conditional("DISTRO_TYPE", "release", "quiet", "debug",d)}' 30CMDLINE_DEBUG = '${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "quiet", d)}'
31 31
32############################################################## 32##############################################################
33# Configure memory/ramdisk split for collie 33# 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 a142816306..ac3aaec746 100644
--- a/meta/packages/tasks/task-oh-sdk.bb
+++ b/meta/packages/tasks/task-oh-sdk.bb
@@ -1,10 +1,13 @@
1DESCRIPTON = "Software Development Tasks for OpenedHand Poky" 1DESCRIPTON = "Software Development Tasks for OpenedHand Poky"
2PR = "r11" 2PR = "r12"
3DEPENDS = "task-oh" 3DEPENDS = "task-oh"
4ALLOW_EMPTY = "1" 4ALLOW_EMPTY = "1"
5PACKAGEFUNCS =+ 'generate_sdk_pkgs' 5#PACKAGEFUNCS =+ 'generate_sdk_pkgs'
6 6
7PACKAGES = "task-oh-sdk" 7PACKAGES = "\
8 task-oh-sdk \
9 task-oh-sdk-dbg \
10 task-oh-sdk-dev"
8 11
9RDEPENDS_task-oh-sdk = "\ 12RDEPENDS_task-oh-sdk = "\
10 autoconf \ 13 autoconf \
@@ -19,43 +22,43 @@ RDEPENDS_task-oh-sdk = "\
19 pkgconfig \ 22 pkgconfig \
20 distcc" 23 distcc"
21 24
22python generate_sdk_pkgs () { 25#python generate_sdk_pkgs () {
23 ohpkgs = read_pkgdata('task-oh', d)['PACKAGES'] 26# ohpkgs = read_pkgdata('task-oh', d)['PACKAGES']
24 pkgs = bb.data.getVar('PACKAGES', d, 1).split() 27# pkgs = bb.data.getVar('PACKAGES', d, 1).split()
25 for pkg in ohpkgs.split(): 28# for pkg in ohpkgs.split():
26 newpkg = pkg.replace('task-oh', 'task-oh-sdk') 29# newpkg = pkg.replace('task-oh', 'task-oh-sdk')
27 30#
28 # for each of the task packages, add a corresponding sdk task 31# # for each of the task packages, add a corresponding sdk task
29 pkgs.append(newpkg) 32# pkgs.append(newpkg)
30 33#
31 # for each sdk task, take the rdepends of the non-sdk task, and turn 34# # for each sdk task, take the rdepends of the non-sdk task, and turn
32 # that into rrecommends upon the -dev versions of those, not unlike 35# # that into rrecommends upon the -dev versions of those, not unlike
33 # the package depchain code 36# # the package depchain code
34 spkgdata = read_subpkgdata(pkg, d) 37# spkgdata = read_subpkgdata(pkg, d)
35 38#
36 rdepends = explode_deps(spkgdata.get('RDEPENDS_%s' % pkg) or '') 39# rdepends = explode_deps(spkgdata.get('RDEPENDS_%s' % pkg) or '')
37 rreclist = [] 40# rreclist = []
38 41#
39 for depend in rdepends: 42# for depend in rdepends:
40 split_depend = depend.split(' (') 43# split_depend = depend.split(' (')
41 name = split_depend[0].strip() 44# name = split_depend[0].strip()
42 if packaged('%s-dev' % name, d): 45# if packaged('%s-dev' % name, d):
43 rreclist.append('%s-dev' % name) 46# rreclist.append('%s-dev' % name)
44 else: 47# else:
45 deppkgdata = read_subpkgdata(name, d) 48# deppkgdata = read_subpkgdata(name, d)
46 rdepends2 = explode_deps(deppkgdata.get('RDEPENDS_%s' % name) or '') 49# rdepends2 = explode_deps(deppkgdata.get('RDEPENDS_%s' % name) or '')
47 for depend in rdepends2: 50# for depend in rdepends2:
48 split_depend = depend.split(' (') 51# split_depend = depend.split(' (')
49 name = split_depend[0].strip() 52# name = split_depend[0].strip()
50 if packaged('%s-dev' % name, d): 53# if packaged('%s-dev' % name, d):
51 rreclist.append('%s-dev' % name) 54# rreclist.append('%s-dev' % name)
52 55#
53 oldrrec = bb.data.getVar('RRECOMMENDS_%s' % newpkg, d) or '' 56# oldrrec = bb.data.getVar('RRECOMMENDS_%s' % newpkg, d) or ''
54 bb.data.setVar('RRECOMMENDS_%s' % newpkg, oldrrec + ' ' + ' '.join(rreclist), d) 57# bb.data.setVar('RRECOMMENDS_%s' % newpkg, oldrrec + ' ' + ' '.join(rreclist), d)
55 # bb.note('RRECOMMENDS_%s = "%s"' % (newpkg, bb.data.getVar('RRECOMMENDS_%s' % newpkg, d))) 58# # bb.note('RRECOMMENDS_%s = "%s"' % (newpkg, bb.data.getVar('RRECOMMENDS_%s' % newpkg, d)))
56 59#
57 # bb.note('pkgs is %s' % pkgs) 60# # bb.note('pkgs is %s' % pkgs)
58 bb.data.setVar('PACKAGES', ' '.join(pkgs), d) 61# bb.data.setVar('PACKAGES', ' '.join(pkgs), d)
59} 62#}
60 63#
61PACKAGES_DYNAMIC = "task-oh-sdk-*" 64#PACKAGES_DYNAMIC = "task-oh-sdk-*"
diff --git a/meta/packages/tasks/task-oh.bb b/meta/packages/tasks/task-oh.bb
index d7f9b055a1..5b9ce8ce81 100644
--- a/meta/packages/tasks/task-oh.bb
+++ b/meta/packages/tasks/task-oh.bb
@@ -1,14 +1,28 @@
1DESCRIPTION = "Tasks for OpenedHand Poky" 1pDESCRIPTION = "Tasks for OpenedHand Poky"
2PR = "r43" 2PR = "r44"
3 3
4PACKAGES = "\ 4PACKAGES = "\
5 task-oh-base \ 5 task-oh-base \
6 task-oh-base-dbg \
7 task-oh-base-dev \
6 task-oh-boot \ 8 task-oh-boot \
9 task-oh-boot-dbg \
10 task-oh-boot-dev \
7 task-oh-standard \ 11 task-oh-standard \
12 task-oh-standard-dbg \
13 task-oh-standard-dev \
8 task-oh-boot-extras \ 14 task-oh-boot-extras \
15 task-oh-boot-extras-dbg \
16 task-oh-boot-extras-dev \
9 task-oh-boot-min-extras \ 17 task-oh-boot-min-extras \
18 task-oh-boot-min-extras-dbg \
19 task-oh-boot-min-extras-dev \
10 task-oh-devtools \ 20 task-oh-devtools \
11 task-oh-testapps" 21 task-oh-devtools-dbg \
22 task-oh-devtools-dev \
23 task-oh-testapps \
24 task-oh-testapps-dbg \
25 task-oh-testapps-dev"
12 26
13XSERVER ?= "xserver-kdrive-fbdev" 27XSERVER ?= "xserver-kdrive-fbdev"
14 28
@@ -29,7 +43,6 @@ RDEPENDS_task-oh-boot = "\
29 ipkg \ 43 ipkg \
30 update-alternatives \ 44 update-alternatives \
31 module-init-tools-depmod" 45 module-init-tools-depmod"
32# linux-hotplug \
33 46
34RDEPENDS_task-oh-boot-extras = "\ 47RDEPENDS_task-oh-boot-extras = "\
35 task-base" 48 task-base"