[oe-commits] org.oe.dev merge of '65fefd8b14862b0291239d37729964b98069c038'
coredump2 commit
openembedded-commits at lists.openembedded.org
Fri Dec 28 16:34:39 UTC 2007
merge of '65fefd8b14862b0291239d37729964b98069c038'
and 'fbb56d5a76093891efdc7abc682059fd0436d4be'
Author: coredump2 at openembedded.org
Branch: org.openembedded.dev
Revision: be0c074741a0dccdd6fa957ac43f2c44be640046
ViewMTN: http://monotone.openembedded.org/revision/info/be0c074741a0dccdd6fa957ac43f2c44be640046
Files:
1
packages/qsvn/qsvn_0.3.0.bb
packages/qsvn/qsvn.inc
packages/kexec/kexec-tools-1.101/kexec-arm-atags.patch
packages/qmake/qmake2-native/0008-backport-qt-lib-infix.patch
packages/qsvn/qsvn-qte_0.3.0.bb
packages/qt4/files/0008-backport-qt-lib-infix.patch
packages/qt4/qtopia-core/build-tools.patch
MAINTAINERS
classes/autotools.bbclass
classes/binconfig.bbclass
classes/insane.bbclass
classes/qtopia4core.bbclass
conf/checksums.ini
conf/distro/angstrom-2008.1.conf
contrib/angstrom/build-feeds.sh
packages/apr/apr-util_1.2.7.bb
packages/apr/apr_1.2.7.bb
packages/kexec/kexec-tools_1.101.bb
packages/libqanava/libqanava_0.0.7.bb
packages/linux/linux-rp-2.6.23/defconfig-akita
packages/linux/linux-rp-2.6.23/defconfig-bootcdx86
packages/linux/linux-rp-2.6.23/defconfig-c7x0
packages/linux/linux-rp-2.6.23/defconfig-collie
packages/linux/linux-rp-2.6.23/defconfig-htcuniversal
packages/linux/linux-rp-2.6.23/defconfig-hx2000
packages/linux/linux-rp-2.6.23/defconfig-poodle
packages/linux/linux-rp-2.6.23/defconfig-qemuarm
packages/linux/linux-rp-2.6.23/defconfig-qemux86
packages/linux/linux-rp-2.6.23/defconfig-spitz
packages/linux/linux-rp-2.6.23/defconfig-tosa
packages/linux/linux-rp-2.6.23/defconfig-zylonite
packages/linux/linux-rp_2.6.23.bb
packages/mkbot/mkbot_0.3.bb
packages/mtd/mtd-utils_1.0.0+git.bb
packages/opie-reader/uqtreader_cvs.bb
packages/qmake/qmake2-native/0001-fix-mkspecs.patch
packages/qmake/qmake2-native.inc
packages/qt4/qt4-x11-free.inc
packages/qt4/qt_configuration.inc
packages/qt4/qt_packaging.inc
packages/qt4/qt_staging.inc
packages/qt4/qtopia-core.inc
packages/qt4/qtopia-core_4.3.3.bb
packages/qxmp/qxmp_1.0.bb
packages/tasks/task-base.bb
packages/texmaker/texmaker_1.3.bb
packages/settings-daemon/settings-daemon_svn.bb
Diffs:
#
# mt diff -r65fefd8b14862b0291239d37729964b98069c038 -rbe0c074741a0dccdd6fa957ac43f2c44be640046
#
#
#
# rename "packages/qsvn/qsvn_0.3.0.bb"
# to "packages/qsvn/qsvn.inc"
#
# add_file "packages/kexec/kexec-tools-1.101/kexec-arm-atags.patch"
# content [5979f478f97d3d977f2cc97804b69580432cbfc4]
#
# add_file "packages/qmake/qmake2-native/0008-backport-qt-lib-infix.patch"
# content [61f4bf073b36988cf5d849c4968fd0231668ec5e]
#
# add_file "packages/qsvn/qsvn-qte_0.3.0.bb"
# content [d9cdc09b1d3e017a6b2821f8180b95dfe62f5817]
#
# add_file "packages/qsvn/qsvn_0.3.0.bb"
# content [c32f3453f2b09b0fab088f8ea9887bb69ad7f912]
#
# add_file "packages/qt4/files/0008-backport-qt-lib-infix.patch"
# content [4d071a20c1c343cfcae88bbb9c4c6ff6153db11f]
#
# add_file "packages/qt4/qtopia-core/build-tools.patch"
# content [6612f0ee0a17e0dbc12ea3bed6fa66232e887240]
#
# patch "MAINTAINERS"
# from [88780961b5762bc908772aea58db8b23c81c3727]
# to [4feb68bdd9be0d74c5e83609ed81cdb2f0e33169]
#
# patch "classes/autotools.bbclass"
# from [e96cf316d44ecfcef44a4db7bddfb8d80facbdc7]
# to [701ff1aa962fc32e4a4625ed4cce861e47ca5694]
#
# patch "classes/binconfig.bbclass"
# from [660275cce8f7fec339f68e7aa419d334663a5a21]
# to [58dc018aedba1b26f08340968881e9b10ad2c6a0]
#
# patch "classes/insane.bbclass"
# from [c89ab78b14303099a174102687650f7ca13b143f]
# to [7da8825b417effe1aecfb300d18b8f1c95e3c3c5]
#
# patch "classes/qtopia4core.bbclass"
# from [7dbc3f0dec99238640767e983264960e4a286e1b]
# to [b1d6e66685818c4024d7bfabaf21b47344f94360]
#
# patch "conf/checksums.ini"
# from [8b808b2bc16a048f0af0417d52948e7da22f97ca]
# to [18e72ca2a2d5b3a7586fc3fe6bed5093235eab58]
#
# patch "conf/distro/angstrom-2008.1.conf"
# from [db7d798ae0bfb0247447e34639d0beebb064abc6]
# to [13f3d678fe8a5316bdf4bf2448984ad0f7fbc69e]
#
# patch "contrib/angstrom/build-feeds.sh"
# from [f2e6a1786dbaa0c8dcb6aa072b2a04d094b8103c]
# to [c3c4156270f65671db2b3a7b33acb26e7c991771]
#
# patch "packages/apr/apr-util_1.2.7.bb"
# from [5bea7d4ba65baaae2f314e0e4725e74384c7d8c6]
# to [662620cf3dc2aeaff4ac4ed3b34ed9acd9d2a39a]
#
# patch "packages/apr/apr_1.2.7.bb"
# from [9816898cd2e93fcd6a95f7506682ab0955872666]
# to [f51f9d791644263063719fdd0f9d24f9a44f7134]
#
# patch "packages/kexec/kexec-tools_1.101.bb"
# from [90e71612793cff1e87109dcec8aa5c8a1894465f]
# to [ca02155fb0738f03ed10922ed0662ff62515da42]
#
# patch "packages/libqanava/libqanava_0.0.7.bb"
# from [e66891a5f5de6794aa9c037785ce20e8032490a2]
# to [3e3955b8d31e3697bcab7b6779ec7788aa7b09f2]
#
# patch "packages/linux/linux-rp-2.6.23/defconfig-akita"
# from [4977ccc396bbd9ae697e9cd5ec6d8c34ff04d530]
# to [ed35da5229e83c9d708876e35f815fd973a327b6]
#
# patch "packages/linux/linux-rp-2.6.23/defconfig-bootcdx86"
# from [5558cdd18f447599d6ba549819dae3d99d919cbb]
# to [fa2eb19850b6a1ebfd945edbc77af349a38f2833]
#
# patch "packages/linux/linux-rp-2.6.23/defconfig-c7x0"
# from [511d465640921b0e994dbc25c4212fabf12ca150]
# to [1245c4d3084a0f248fe10f90a1ef8eb1c2866f91]
#
# patch "packages/linux/linux-rp-2.6.23/defconfig-collie"
# from [61e97e08b4342ff704be5b57783344f6d2834896]
# to [9ffd9b1fadb6288179b7b23413e91d4eb9442460]
#
# patch "packages/linux/linux-rp-2.6.23/defconfig-htcuniversal"
# from [c15ceaf3e170f40ee7b76bf8bd498450551060ad]
# to [e857690d16edf59ddfac6eb26161fe53e4ed9699]
#
# patch "packages/linux/linux-rp-2.6.23/defconfig-hx2000"
# from [ca400be76cfeca2feb187a33538407a633e15bc5]
# to [bb743d9e1d64d7aabe5903f81e95963f04c5c72f]
#
# patch "packages/linux/linux-rp-2.6.23/defconfig-poodle"
# from [7abd6d286f0381c0944b56f36a66ca2e73efd26b]
# to [102b49ef0fabd205231bbb2cc1aa7c21d08b5000]
#
# patch "packages/linux/linux-rp-2.6.23/defconfig-qemuarm"
# from [677d6694b1fa93712c468b324b1cda3ba60d1787]
# to [91daad30a645e0041554eaa3129572f741f9363b]
#
# patch "packages/linux/linux-rp-2.6.23/defconfig-qemux86"
# from [13ba6932d390681dfa74465511435d21ed675514]
# to [9dc59c1b80636bf9fe0714da4db9b01f0129d2f4]
#
# patch "packages/linux/linux-rp-2.6.23/defconfig-spitz"
# from [60f2f3675a8045720aebad8b900d6c464040e0e3]
# to [a19c44d5fdb2d5af547aa8ccaf27eec19de9371e]
#
# patch "packages/linux/linux-rp-2.6.23/defconfig-tosa"
# from [01f4884968a401014d287420a8a8d679c3b8feb2]
# to [2e5f481df13fba16a4eecee773c4d1fc587016d6]
#
# patch "packages/linux/linux-rp-2.6.23/defconfig-zylonite"
# from [3a9d67a339675e9dee9874ffed84dc3ba368eb0a]
# to [b0d279ba0a0fa8b24c9626225ab8d48e1b615fb6]
#
# patch "packages/linux/linux-rp_2.6.23.bb"
# from [cd9a0399f2401ae21ff1d9fd0ce936b54fc165c9]
# to [1f5858f24a5615fa3a5a1901c638b63a94ffa9db]
#
# patch "packages/mkbot/mkbot_0.3.bb"
# from [94faa4fbee0a91b55a0efba3abbed0ccda53190c]
# to [fc500581f870bcb7d466b7220ed8d247599bb626]
#
# patch "packages/mtd/mtd-utils_1.0.0+git.bb"
# from [28c59a29a8f4cc26b7723edd88cd3ee953be98f4]
# to [db38f6e2d20f70fbb76af8a5fd01ade273c67858]
#
# patch "packages/opie-reader/uqtreader_cvs.bb"
# from [61873b6271c2f1decde3ab439dda692a2aa98a36]
# to [5a3fde92d074cd092fad631555d293ec71fe1c78]
#
# patch "packages/qmake/qmake2-native/0001-fix-mkspecs.patch"
# from [d5283fc24b925190ca90f56511934f3fd132ea17]
# to [ad389a1d1a14923dffb662fdf22cbac4ca302054]
#
# patch "packages/qmake/qmake2-native.inc"
# from [d58b0ef825d0f6d7d1a0103da1b2ec0e903de4b2]
# to [fddea3b5f77f8297595bf49e8c4424d359cb4d8c]
#
# patch "packages/qsvn/qsvn.inc"
# from [70ce70cd2a14e148b93ed7445cd8cc4346f799c7]
# to [42c9403b998ba47419e92557acc1a1639b1016da]
#
# patch "packages/qt4/qt4-x11-free.inc"
# from [4999377acbce5c192356f465789adc625e3135f3]
# to [4659f983944ce6319310e2accb2194a030d39fe6]
#
# patch "packages/qt4/qt_configuration.inc"
# from [5abde732116982782ed3a94ede56bf274012fc1f]
# to [cce5b8ce2ed155407f5e1cc3cec47337b54bef86]
#
# patch "packages/qt4/qt_packaging.inc"
# from [6c277ec158a91be79bb7e6484f8610fdc85e729c]
# to [49645ec215cac92b25eb2867013540ce7d7bd328]
#
# patch "packages/qt4/qt_staging.inc"
# from [426479a75ece31757e047679175820b2fdf3fcfb]
# to [7cfc32182e50d232e37d0c6ff7a596d8ec467cc7]
#
# patch "packages/qt4/qtopia-core.inc"
# from [c772ab48d1d0aed43a6f098861d9c762e9dd4f32]
# to [afdef9632312a739952146a0359c30d1fc64c12f]
#
# patch "packages/qt4/qtopia-core_4.3.3.bb"
# from [79b0ab4f4981a89ecb7eecc8556f7d53c2e6d671]
# to [9272f8ac29a03d2b11a73f4636b20468b3c281ec]
#
# patch "packages/qxmp/qxmp_1.0.bb"
# from [8f00c929b130f5c608826d9e7457f7d9783e0fb0]
# to [691fb52466f95dcf87239fc9189d83548146c758]
#
# patch "packages/tasks/task-base.bb"
# from [d0254a959c66b155e6d69adbbcdb70daa866cc07]
# to [797b15619704c023c1e4777ddc0474fcea386fcd]
#
# patch "packages/texmaker/texmaker_1.3.bb"
# from [c837721d4bd4e0060e54a8e6976a06f7912fc5c3]
# to [2c52212d629c17bb3f497280943e0589792ed8a0]
#
============================================================
--- packages/kexec/kexec-tools-1.101/kexec-arm-atags.patch 5979f478f97d3d977f2cc97804b69580432cbfc4
+++ packages/kexec/kexec-tools-1.101/kexec-arm-atags.patch 5979f478f97d3d977f2cc97804b69580432cbfc4
@@ -0,0 +1,294 @@
+---
+ kexec/arch/arm/kexec-zImage-arm.c | 259 ++++++++++++++++++++++++++++++++++++--
+ 1 file changed, 252 insertions(+), 7 deletions(-)
+
+Index: kexec-tools-1.101/kexec/arch/arm/kexec-zImage-arm.c
+===================================================================
+--- kexec-tools-1.101.orig/kexec/arch/arm/kexec-zImage-arm.c 2007-12-26 21:17:07.000000000 +0000
++++ kexec-tools-1.101/kexec/arch/arm/kexec-zImage-arm.c 2007-12-27 01:24:25.000000000 +0000
+@@ -1,11 +1,83 @@
++/*
++ * - 08/21/2007 ATAG support added by Uli Luckas <u.luckas at road.de>
++ *
++ */
+ #define _GNU_SOURCE
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdlib.h>
+ #include <errno.h>
+ #include <limits.h>
++#include <stdint.h>
++#include <getopt.h>
++#include <arch/options.h>
++#include <asm/page.h>
+ #include "../../kexec.h"
+
++#define COMMAND_LINE_SIZE 1024
++#define BOOT_PARAMS_SIZE 1536
++
++struct tag_header {
++ uint32_t size;
++ uint32_t tag;
++};
++
++/* The list must start with an ATAG_CORE node */
++#define ATAG_CORE 0x54410001
++
++struct tag_core {
++ uint32_t flags; /* bit 0 = read-only */
++ uint32_t pagesize;
++ uint32_t rootdev;
++};
++
++/* it is allowed to have multiple ATAG_MEM nodes */
++#define ATAG_MEM 0x54410002
++
++struct tag_mem32 {
++ uint32_t size;
++ uint32_t start; /* physical start address */
++};
++
++/* describes where the compressed ramdisk image lives (virtual address) */
++/*
++ * this one accidentally used virtual addresses - as such,
++ * it's deprecated.
++ */
++#define ATAG_INITRD 0x54410005
++
++/* describes where the compressed ramdisk image lives (physical address) */
++#define ATAG_INITRD2 0x54420005
++
++struct tag_initrd {
++ uint32_t start; /* physical start address */
++ uint32_t size; /* size of compressed ramdisk image in bytes */
++};
++
++/* command line: \0 terminated string */
++#define ATAG_CMDLINE 0x54410009
++
++struct tag_cmdline {
++ char cmdline[1]; /* this is the minimum size */
++};
++
++/* The list ends with an ATAG_NONE node. */
++#define ATAG_NONE 0x00000000
++
++struct tag {
++ struct tag_header hdr;
++ union {
++ struct tag_core core;
++ struct tag_mem32 mem;
++ struct tag_initrd initrd;
++ struct tag_cmdline cmdline;
++ } u;
++};
++
++#define tag_next(t) ((struct tag *)((uint32_t *)(t) + (t)->hdr.size))
++#define byte_size(t) ((t)->hdr.size << 2)
++#define tag_size(type) ((sizeof(struct tag_header) + sizeof(struct type) + 3) >> 2)
++
+ int zImage_arm_probe(const char *buf, off_t len)
+ {
+ /*
+@@ -14,21 +86,194 @@ int zImage_arm_probe(const char *buf, of
+ */
+ return 0;
+ }
++
+ void zImage_arm_usage(void)
+ {
++ printf( " --command-line=STRING Set the kernel command line to STRING.\n"
++ " --append=STRING Set the kernel command line to STRING.\n"
++ " --initrd=FILE Use FILE as the kernel's initial ramdisk.\n"
++ " --ramdisk=FILE Use FILE as the kernel's initial ramdisk.\n"
++ );
+ }
+-int zImage_arm_load(int argc, char **argv, const char *buf, off_t len,
++
++static
++struct tag * atag_read_tags(void)
++{
++ static unsigned long buf[BOOT_PARAMS_SIZE];
++ const char fn[]= "/proc/atags";
++ FILE *fp;
++ fp = fopen(fn, "r");
++ if (!fp) {
++ fprintf(stderr, "Cannot open %s: %s\n",
++ fn, strerror(errno));
++ return NULL;
++ }
++
++ fread(buf, sizeof(buf[1]), BOOT_PARAMS_SIZE, fp);
++ if (ferror(fp)) {
++ fprintf(stderr, "Cannot read %s: %s\n",
++ fn, strerror(errno));
++ fclose(fp);
++ return NULL;
++ }
++
++ fclose(fp);
++ return (struct tag *) buf;
++}
++
++
++static
++int atag_arm_load(struct kexec_info *info, unsigned long base,
++ const char *command_line, off_t command_line_len,
++ const char *initrd, off_t initrd_len)
++{
++ struct tag *saved_tags = atag_read_tags();
++ char *buf;
++ off_t len;
++ struct tag *params;
++ uint32_t *initrd_start;
++
++ buf = xmalloc(getpagesize());
++ if (!buf) {
++ fprintf(stderr, "Compiling ATAGs: out of memory\n");
++ return -1;
++ }
++
++ memset(buf, 0xff, getpagesize());
++ params = (struct tag *)buf;
++
++ if (saved_tags) {
++ // Copy tags
++ saved_tags = (struct tag *) saved_tags;
++ while(byte_size(saved_tags)) {
++ switch (saved_tags->hdr.tag) {
++ case ATAG_INITRD:
++ case ATAG_INITRD2:
++ case ATAG_CMDLINE:
++ case ATAG_NONE:
++ // skip these tags
++ break;
++ default:
++ // copy all other tags
++ memcpy(params, saved_tags, byte_size(saved_tags));
++ params = tag_next(params);
++ }
++ saved_tags = tag_next(saved_tags);
++ }
++ } else {
++ params->hdr.size = 2;
++ params->hdr.tag = ATAG_CORE;
++ params = tag_next(params);
++ }
++
++ if (initrd) {
++ params->hdr.size = tag_size(tag_initrd);
++ params->hdr.tag = ATAG_INITRD2;
++ initrd_start = ¶ms->u.initrd.start;
++ params->u.initrd.size = initrd_len;
++ params = tag_next(params);
++ }
++
++ if (command_line) {
++ params->hdr.size = (sizeof(struct tag_header) + command_line_len + 3) >> 2;
++ params->hdr.tag = ATAG_CMDLINE;
++ memcpy(params->u.cmdline.cmdline, command_line,
++ command_line_len);
++ params->u.cmdline.cmdline[command_line_len - 1] = '\0';
++ params = tag_next(params);
++ }
++
++ params->hdr.size = 0;
++ params->hdr.tag = ATAG_NONE;
++
++ len = ((char *)params - buf) + sizeof(struct tag_header);
++
++ add_segment(info, buf, len, base, len);
++
++ if (initrd) {
++ struct memory_range *range;
++ int ranges;
++ get_memory_ranges(&range, &ranges);
++ *initrd_start = locate_hole(info, initrd_len, getpagesize(), range[0].start + 0x800000, ULONG_MAX, INT_MAX);
++ if (*initrd_start == ULONG_MAX)
++ return -1;
++ add_segment(info, initrd, initrd_len, *initrd_start, initrd_len);
++ }
++
++ return 0;
++}
++
++int zImage_arm_load(int argc, char **argv, const char *buf, off_t len,
+ struct kexec_info *info)
+ {
+ unsigned long base;
+- unsigned int offset = 0x8000; /* 32k offset from memory start */
++ unsigned int atag_offset = 0x1000; /* 4k offset from memory start */
++ unsigned int offset = 0x8000; /* 32k offset from memory start */
++ const char *command_line;
++ off_t command_line_len;
++ const char *ramdisk;
++ char *ramdisk_buf;
++ off_t ramdisk_length;
++ int opt;
++#define OPT_APPEND 'a'
++#define OPT_RAMDISK 'r'
++ static const struct option options[] = {
++ KEXEC_ARCH_OPTIONS
++ { "command-line", 1, 0, OPT_APPEND },
++ { "append", 1, 0, OPT_APPEND },
++ { "initrd", 1, 0, OPT_RAMDISK },
++ { "ramdisk", 1, 0, OPT_RAMDISK },
++ { 0, 0, 0, 0 },
++ };
++ static const char short_options[] = KEXEC_ARCH_OPT_STR "a:r:";
++
++ /*
++ * Parse the command line arguments
++ */
++ command_line = 0;
++ command_line_len = 0;
++ ramdisk = 0;
++ ramdisk_buf = 0;
++ ramdisk_length = 0;
++ while((opt = getopt_long(argc, argv, short_options, options, 0)) != -1) {
++ switch(opt) {
++ default:
++ /* Ignore core options */
++ if (opt < OPT_ARCH_MAX) {
++ break;
++ }
++ case '?':
++ usage();
++ return -1;
++ case OPT_APPEND:
++ command_line = optarg;
++ break;
++ case OPT_RAMDISK:
++ ramdisk = optarg;
++ break;
++ }
++ }
++ if (command_line) {
++ command_line_len = strlen(command_line) + 1;
++ if (command_line_len > COMMAND_LINE_SIZE)
++ command_line_len = COMMAND_LINE_SIZE;
++ }
++ if (ramdisk) {
++ ramdisk_buf = slurp_file(ramdisk, &ramdisk_length);
++ }
++
+ base = locate_hole(info,len+offset,0,0,ULONG_MAX,INT_MAX);
+ if (base == ULONG_MAX)
+- {
+ return -1;
+- }
+- base += offset;
+- add_segment(info,buf,len,base,len);
+- info->entry = (void*)base;
++
++ if (atag_arm_load(info, base + atag_offset,
++ command_line, command_line_len,
++ ramdisk_buf, ramdisk_length) == -1)
++ return -1;
++
++ add_segment(info, buf, len, base + offset, len);
++
++ info->entry = (void*)base + offset;
++
+ return 0;
+ }
============================================================
--- packages/qmake/qmake2-native/0008-backport-qt-lib-infix.patch 61f4bf073b36988cf5d849c4968fd0231668ec5e
+++ packages/qmake/qmake2-native/0008-backport-qt-lib-infix.patch 61f4bf073b36988cf5d849c4968fd0231668ec5e
@@ -0,0 +1,33 @@
+diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
+index 32a7fd5..48d584f 100644
+--- a/mkspecs/features/qt_functions.prf
++++ b/mkspecs/features/qt_functions.prf
+@@ -28,7 +28,7 @@ defineTest(qtAddLibrary) {
+ INCLUDEPATH -= $$FRAMEWORK_INCLUDE
+ INCLUDEPATH = $$FRAMEWORK_INCLUDE $$INCLUDEPATH
+ }
+- LINKAGE = -framework $${LIB_NAME}
++ LINKAGE = -framework $${LIB_NAME}$${QT_LIBINFIX}
+ } else:!qt_no_framework { #detection
+ for(frmwrk_dir, $$list($$QMAKE_LIBDIR_QT $$QMAKE_LIBDIR $$(DYLD_FRAMEWORK_PATH) /Library/Frameworks)) {
+ exists($${frmwrk_dir}/$${LIB_NAME}.framework) {
+@@ -46,15 +46,15 @@ defineTest(qtAddLibrary) {
+ }
+ isEmpty(LINKAGE) {
+ CONFIG(debug, debug|release) {
+- win32:LINKAGE = -l$${LIB_NAME}d
+- mac:LINKAGE = -l$${LIB_NAME}_debug
++ win32:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}d
++ mac:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}_debug
+ }
+- isEmpty(LINKAGE):LINKAGE = -l$${LIB_NAME}
++ isEmpty(LINKAGE):LINKAGE = -l$${LIB_NAME}$%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rfbb56d5a76093891efdc7abc682059fd0436d4be -rbe0c074741a0dccdd6fa957ac43f2c44be640046
#
#
#
# patch "packages/settings-daemon/settings-daemon_svn.bb"
# from [645f5cd35518ca1a4b650a7c494a2bed8154ac61]
# to [f266cffda5f763fbd31050c83eb2c9e97bfcaaac]
#
============================================================
--- packages/settings-daemon/settings-daemon_svn.bb 645f5cd35518ca1a4b650a7c494a2bed8154ac61
+++ packages/settings-daemon/settings-daemon_svn.bb f266cffda5f763fbd31050c83eb2c9e97bfcaaac
@@ -1,10 +1,12 @@ LICENSE = "GPL"
DESCRIPTION = "Settings-daemon provides a bridge between gconf and xsettings"
LICENSE = "GPL"
-DEPENDS = "gconf glib-2.0"
+DEPENDS = "gconf glib-2.0 gtk+"
RDEPENDS = "xrdb"
SECTION = "x11"
PV = "0.0+svnr${SRCREV}"
+PR = "r1"
+
SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
file://70settings-daemon"
More information about the Openembedded-commits
mailing list