diff options
| author | Koen Kooi <koen@openembedded.org> | 2007-11-19 15:17:47 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-11-19 15:17:47 +0000 |
| commit | 71ce7ab5698d5ba25a4ba7f27cf1b32560054f4c (patch) | |
| tree | 763927435a5d8d5b260304eb0ce800b4c0ad4e9f | |
| parent | 517c4f8346f966c6d9f3976955415f38d5d4d38d (diff) | |
| parent | ca232b759e5b42183969f926454d493ee072dad1 (diff) | |
merge of '50705f6719ea83bd28466a1c4445ea1f3af2dd73'
and 'e278d635280136dca9a2d1d6bce39908402e377f'
| -rw-r--r-- | conf/distro/angstrom-2007.1.conf | 4 | ||||
| -rw-r--r-- | conf/distro/angstrom-2008.1.conf | 4 | ||||
| -rw-r--r-- | packages/tasks/task-base.bb | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 6f3bdb5aea..427a448ecf 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -14,7 +14,7 @@ require conf/distro/include/sane-srcdates.inc require conf/distro/include/sane-srcrevs.inc #Images built can have to modes: -# 'debug': empty rootpassword, strace and gdb included +# 'debug': empty rootpassword, strace included # 'release' no root password, no strace and gdb by default DISTRO_TYPE ?= "debug" #DISTRO_TYPE = "release" @@ -206,7 +206,7 @@ require conf/distro/include/angstrom${ARM_ABI}.inc # We want to ship extra debug utils in the rootfs when doing a debug build DEBUG_APPS ?= "" -DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "tslib-tests tslib-calibrate gdb strace procps",d)}' +DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "strace procps",d)}' #this should go away soon EXTRA_STUFF ?= "" diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index b5105755f0..9614581ffc 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -20,7 +20,7 @@ require conf/distro/include/sane-srcdates.inc require conf/distro/include/sane-srcrevs.inc #Images built can have to modes: -# 'debug': empty rootpassword, strace and gdb included +# 'debug': empty rootpassword, strace included # 'release' no root password, no strace and gdb by default DISTRO_TYPE ?= "debug" #DISTRO_TYPE = "release" @@ -168,7 +168,7 @@ require conf/distro/include/angstrom${ARM_ABI}.inc # We want to ship extra debug utils in the rootfs when doing a debug build DEBUG_APPS ?= "" -DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "tslib-tests tslib-calibrate gdb strace procps",d)}' +DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "strace procps",d)}' # Angstrom want to ship some extra stuff. This should be moved into task-base eventually # contains ipkg specific stuff as well :( diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index 412254d944..07de84c8c2 100644 --- a/packages/tasks/task-base.bb +++ b/packages/tasks/task-base.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro options to create a basic machine task/package" -PR = "r44" +PR = "r45" inherit task |