diff options
| author | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-03-17 13:02:01 +0100 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-03-17 13:02:01 +0100 |
| commit | 158be4c48fd1b86cd4f58eee8d1d10958d1be195 (patch) | |
| tree | 5d29d0a3d617927208c5f4586bf33889f6550ec5 /conf | |
| parent | 3bc21dfdeba7deed9bbaee6d490fc05bb71d2203 (diff) | |
| parent | 1f445f44f3e95a0aeff0e3f15b620012bbf9dd1a (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/checksums.ini | 12 | ||||
| -rw-r--r-- | conf/distro/include/fso-autorev.inc | 2 | ||||
| -rw-r--r-- | conf/distro/minimal.conf | 5 |
3 files changed, 11 insertions, 8 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index a206eb7443..578a6d8b57 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -18119,8 +18119,8 @@ md5=e4e6155530a23ea0ea4ca59f8c5fda8c sha256=e86a0a81ce1b989a4d06e0c07d64e1fcbba2456fa8e22ae24f333f186f3fc663 [http://gpephone.linuxtogo.org/download/gpephone/phoneserver-1.0/phoneserver-1.0.tar.bz2] -md5=195b684e025ff5c15617d6f757cf631f -sha256=e14546d11e899e7e9f06ca58979fee14b273d53c637eb268d7c6fe3bf78d564d +md5=6f6450c4e762059e790216b15b5930e6 +sha256=a1f05eba12369fb8bafb53559ae5ab2855ab1e83746049a100ce5a6d69bec2a6 [http://de3.php.net/distributions/php-4.4.4.tar.bz2] md5=bc6fa8908e2ac36e93bab9f7d42cda3a @@ -20999,8 +20999,8 @@ md5=a362dc3f5f23d785990917103c76a43d sha256=084f8286eb945455f3f1567c0a7e7df3a759f2a4e1aab3b881b8ef1bda5bdb21 [http://gpephone.linuxtogo.org/download/gpephone/soundserver-1.0/soundserver-1.0.tar.bz2] -md5=95a2346791fb461d570808369ac5a2bb -sha256=0b1009cd6bb5a345be3fe69048b23c8f3248a86340832861f0ffda9e368a6015 +md5=14cbf40e5c6ba1ac05a9309d392326fc +sha256=2cd45d30fcf862f65d3d9a096e69df1e6520920b01cc35fe66e1f21799645614 [http://mutab0r.chat.ru/soundtracker-0.6.7.gtk2.tar.bz2] md5=e10563187f49d9f39d360d4c59de6c6c @@ -23059,8 +23059,8 @@ md5=511ffbc8ed8d9df82e7c67852164728c sha256=ee1faf72ef745a7d96e44cb4797d92a8cd2c9e290dfe602fae0fd955a11d4f3a [http://gpephone.linuxtogo.org/download/gpephone/voicecall-0.1/voicecall-0.1.tar.gz] -md5=c775c0663a5c499d3f2ac23602e98426 -sha256=52f8a7087960aa8845941d08d4fe58c29670c374fbeccd722dd5fbfe995fb89c +md5=7fa731310c2f5e334ca4eba9c5482965 +sha256=f6ddc993d4890b9500a63345f76acd3eb4a04a9190fcd055f323319627bf104e [http://www.wirelessdefence.org/Contents/Files/void11-0.2.0.tar.bz2] md5=1c5b3e3e70916de74c2932c7f3e46d9e diff --git a/conf/distro/include/fso-autorev.inc b/conf/distro/include/fso-autorev.inc index 6de3c82a38..a95a0da4ef 100644 --- a/conf/distro/include/fso-autorev.inc +++ b/conf/distro/include/fso-autorev.inc @@ -3,6 +3,7 @@ SRCREV_pn-dbus-hlid = "${AUTOREV}" SRCREV_pn-frameworkd = "${AUTOREV}" SRCREV_pn-frameworkd-devel = "${AUTOREV}" SRCREV_pn-fsod = "${AUTOREV}" +SRCREV_pn-fsodeviced = "${AUTOREV}" SRCREV_pn-fso-abyss = "${AUTOREV}" SRCREV_pn-fso-apm = "${AUTOREV}" SRCREV_pn-fso-gsm0710muxd = "${AUTOREV}" @@ -11,6 +12,7 @@ SRCREV_pn-fso-monitord = "${AUTOREV}" SRCREV_pn-fso-sounds = "${AUTOREV}" SRCREV_pn-gsmd2 = "${AUTOREV}" SRCREV_pn-illume-theme-freesmartphone = "${AUTOREV}" +SRCREV_pn-libfsoframework = "${AUTOREV}" SRCREV_pn-libframeworkd-glib = "${AUTOREV}" SRCREV_pn-libgsm0710 = "${AUTOREV}" SRCREV_pn-libgsm0710mux = "${AUTOREV}" diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf index 196018b431..f7c33d4ed6 100644 --- a/conf/distro/minimal.conf +++ b/conf/distro/minimal.conf @@ -99,8 +99,8 @@ require conf/distro/include/preferred-xorg-versions-X11R7.4.inc ############################################################################# # Ship extra debug utils in the rootfs when doing a debug build -DEBUG_APPS ?= "" -DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "task-cli-tools-debug",d)}' +DISTRO_EXTRA_APPS ?= "" +DISTRO_EXTRA_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "task-cli-tools-debug",d)}' # Additional content I (only valid if you include task-base) # distro-feed-configs: configuration files for the online feeds @@ -110,6 +110,7 @@ DISTRO_EXTRA_RDEPENDS += "\ distro-feed-configs \ util-linux-ng-mount util-linux-ng-umount \ angstrom-libc-fixup-hack \ + ${DISTRO_EXTRA_APPS} \ " # Additional content II (can be masked with BAD_RECOMMENDS) |