[oe-commits] org.oe.dev merge of '8819bbf6f539509b1d3b6df6a827db9c8050a2e3'

florian commit openembedded-commits at lists.openembedded.org
Wed Jan 23 18:05:57 UTC 2008


merge of '8819bbf6f539509b1d3b6df6a827db9c8050a2e3'
     and 'adb47d7ef0b6d4d6be87bfe0025501107f2d04cc'

Author: florian at openembedded.org
Branch: org.openembedded.dev
Revision: 80b859fca517453fbf9452382bdeca8ba7458540
ViewMTN: http://monotone.openembedded.org/revision/info/80b859fca517453fbf9452382bdeca8ba7458540
Files:
1
packages/gsm/libgsmd-lips_svn.bb
packages/gpephone/libgpephone_svn.bb
packages/linux/linux-openmoko-devel_svn+2.6.23.1.bb
packages/linux/linux-openmoko-devel_svn+2.6.24-rc6.bb
packages/prelink/prelink-20060712
packages/prelink/prelink-20061027
packages/prelink/prelink_20060712.bb
packages/prelink/prelink_20061027.bb
classes/kernel.bbclass
packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-collie
packages/linux/linux-rp_2.6.23+2.6.24-rc8.bb
packages/meta/external-toolchain.bb
packages/prelink/prelink-20061027/arm_eabi.patch
packages/qt4/qt_packaging.inc
packages/tasks/task-openmoko-toolchain-host.bb
Diffs:

#
# mt diff -r8819bbf6f539509b1d3b6df6a827db9c8050a2e3 -r80b859fca517453fbf9452382bdeca8ba7458540
#
# 
# 
# delete "packages/gsm/libgsmd-lips_svn.bb"
# 
# patch "packages/gpephone/libgpephone_svn.bb"
#  from [c3f4dfe67ee079fe71f23797fde9a011e9fa8fae]
#    to [b4f207b2fa7c58e64eed0846a53c298950c2f46b]
# 
============================================================
--- packages/gpephone/libgpephone_svn.bb	c3f4dfe67ee079fe71f23797fde9a011e9fa8fae
+++ packages/gpephone/libgpephone_svn.bb	b4f207b2fa7c58e64eed0846a53c298950c2f46b
@@ -6,9 +6,11 @@ PR          = "r0"
 PV = "0.4+svnr-${SRCREV}"
 PR          = "r0"
 
+inherit gpephone pkgconfig autotools
 SRC_URI = "${GPEPHONE_SVN}"
-inherit gpephone pkgconfig autotools
 
+S = "${WORKDIR}/${PN}"
+
 do_stage () {
 	autotools_stage_all
 }


#
# mt diff -radb47d7ef0b6d4d6be87bfe0025501107f2d04cc -r80b859fca517453fbf9452382bdeca8ba7458540
#
# 
# 
# delete "packages/linux/linux-openmoko-devel_svn+2.6.23.1.bb"
# 
# delete "packages/linux/linux-openmoko-devel_svn+2.6.24-rc6.bb"
# 
# rename "packages/prelink/prelink-20060712"
#     to "packages/prelink/prelink-20061027"
# 
# rename "packages/prelink/prelink_20060712.bb"
#     to "packages/prelink/prelink_20061027.bb"
# 
# patch "classes/kernel.bbclass"
#  from [0a8f1fb021e05b2bb2d0d90220ce554ae65408c2]
#    to [5e2fcea2343f6d39c34c218026c453952cb0c444]
# 
# patch "packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-collie"
#  from [c4ddf6f7a69b40a2cc6aec21cd1f07f72af013dd]
#    to [c9da3bd7bc66685ea2b3e52ada4b3b1ea3d3353f]
# 
# patch "packages/linux/linux-rp_2.6.23+2.6.24-rc8.bb"
#  from [91c8f73922532616261250e9409b344de817d50d]
#    to [6eabfddf3cf9eab10a398a56f6f2e7c58059c837]
# 
# patch "packages/meta/external-toolchain.bb"
#  from [dcaf40be62789b278a8bcf32b7d1a80010487c6a]
#    to [8a4aa638876b87a86af07f785abb89bf79bf0378]
# 
# patch "packages/prelink/prelink-20061027/arm_eabi.patch"
#  from [792cf1d80928f065648d51195df0b0ab7e20d3ad]
#    to [e37e8305a07409cb123af8404160dc90f6366058]
# 
# patch "packages/prelink/prelink_20061027.bb"
#  from [39f815f5486961924f46aadcc0d4245c808b5667]
#    to [f1e5e6b4ecc0058d522c825034b33534b8866429]
# 
# patch "packages/qt4/qt_packaging.inc"
#  from [b7908307df304cf7663fbeed5aa0765694bc334f]
#    to [10c4b21735e8cff175978c971577e1cac4681cad]
# 
# patch "packages/tasks/task-openmoko-toolchain-host.bb"
#  from [b9a3d69c6fddd5412b4d45ac8d8190ff8c06fc9c]
#    to [18d598d5b825df34b71ca3782f11a025f482fd94]
# 
============================================================
--- classes/kernel.bbclass	0a8f1fb021e05b2bb2d0d90220ce554ae65408c2
+++ classes/kernel.bbclass	5e2fcea2343f6d39c34c218026c453952cb0c444
@@ -231,6 +231,8 @@ module_autoload_sa1100-rtc = "sa1100-rtc
 module_autoload_ircomm-tty = "ircomm-tty"
 module_autoload_rfcomm = "rfcomm"
 module_autoload_sa1100-rtc = "sa1100-rtc"
+# sa1100-rtc was renamed in 2.6.23 onwards
+module_autoload_rtc-sa1100 = "rtc-sa1100"
 
 # alias defaults (alphabetically sorted)
 module_conf_af_packet = "alias net-pf-17 af_packet"
============================================================
--- packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-collie	c4ddf6f7a69b40a2cc6aec21cd1f07f72af013dd
+++ packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-collie	c9da3bd7bc66685ea2b3e52ada4b3b1ea3d3353f
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.24-rc8
-# Sun Jan 20 18:52:49 2008
+# Mon Jan 21 21:35:18 2008
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1279,9 +1279,9 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_EFI_PARTITION is not set
 # CONFIG_SYSV68_PARTITION is not set
-CONFIG_NLS=y
+CONFIG_NLS=m
 CONFIG_NLS_DEFAULT="cp437"
-CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_437=m
 CONFIG_NLS_CODEPAGE_737=m
 CONFIG_NLS_CODEPAGE_775=m
 CONFIG_NLS_CODEPAGE_850=m
@@ -1305,7 +1305,7 @@ CONFIG_NLS_ASCII=m
 CONFIG_NLS_CODEPAGE_1250=m
 CONFIG_NLS_CODEPAGE_1251=m
 CONFIG_NLS_ASCII=m
-CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_1=m
 CONFIG_NLS_ISO8859_2=m
 CONFIG_NLS_ISO8859_3=m
 CONFIG_NLS_ISO8859_4=m
============================================================
--- packages/linux/linux-rp_2.6.23+2.6.24-rc8.bb	91c8f73922532616261250e9409b344de817d50d
+++ packages/linux/linux-rp_2.6.23+2.6.24-rc8.bb	6eabfddf3cf9eab10a398a56f6f2e7c58059c837
@@ -1,6 +1,6 @@ require linux-rp.inc
 require linux-rp.inc
 
-PR = "r1"
+PR = "r2"
 
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_collie = "1"
============================================================
--- packages/meta/external-toolchain.bb	dcaf40be62789b278a8bcf32b7d1a80010487c6a
+++ packages/meta/external-toolchain.bb	8a4aa638876b87a86af07f785abb89bf79bf0378
@@ -15,7 +15,7 @@ PROVIDES = "\
     virtual/linux-libc-headers \
     "
 
-RPROVIDES = "glibc-utils libsegfault glibc-thread-db libgcc-dev libstdc++-dev libstdc++"
+#RPROVIDES = "glibc-utils libsegfault glibc-thread-db libgcc-dev libstdc++-dev libstdc++"
 PACKAGES_DYNAMIC = "glibc-gconv-*"
 PR = "r1"
 
============================================================
--- packages/prelink/prelink-20061027/arm_eabi.patch	792cf1d80928f065648d51195df0b0ab7e20d3ad
+++ packages/prelink/prelink-20061027/arm_eabi.patch	e37e8305a07409cb123af8404160dc90f6366058
@@ -1,16 +1,22 @@
-Index: prelink-0.0.20050901/src/arch-arm.c
+---
+ src/arch-arm.c |  177 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
+ 1 file changed, 172 insertions(+), 5 deletions(-)
+
+Index: prelink-0.0.20061027/src/arch-arm.c
 ===================================================================
---- prelink-0.0.20050901.orig/src/arch-arm.c	2004-09-30 17:07:57.000000000 +0100
-+++ prelink-0.0.20050901/src/arch-arm.c	2006-04-07 14:41:25.000000000 +0100
-@@ -145,6 +145,24 @@
+--- prelink-0.0.20061027.orig/src/arch-arm.c	2006-08-13 16:18:17.000000000 +0100
++++ prelink-0.0.20061027/src/arch-arm.c	2007-09-04 12:29:06.000000000 +0100
+@@ -145,6 +145,26 @@ arm_prelink_rel (struct prelink_info *in
        error (0, 0, "%s: R_ARM_PC24 relocs with non-zero addend should not be present in prelinked REL sections",
  	     dso->filename);
        return 1;
-+   case R_ARM_TLS_DTPOFF32:
-+      write_le32 (dso, rel->r_offset, value);
++    /* DTPOFF32, DTPMOD32 and TPOFF32 is impossible to predict unless prelink
++       sets the rules.  Also for DTPOFF32/TPOFF32 there is REL->RELA problem.  */
++    case R_ARM_TLS_DTPOFF32:
++      if (dso->ehdr.e_type == ET_EXEC)
++	error (0, 0, "%s: R_ARM_TLS_DTPOFF32 relocs should not be present in prelinked ET_EXEC REL sections",
++	       dso->filename);
 +      break;
-+    /* DTPMOD32 and TPOFF32 is impossible to predict unless prelink
-+       sets the rules.  Also for TPOFF{32,} there is REL->RELA problem.  */
 +    case R_ARM_TLS_DTPMOD32:
 +      if (dso->ehdr.e_type == ET_EXEC)
 +	{
@@ -27,14 +33,15 @@ Index: prelink-0.0.20050901/src/arch-arm
      case R_ARM_COPY:
        if (dso->ehdr.e_type == ET_EXEC)
  	/* COPY relocs are handled specially in generic code.  */
-@@ -195,6 +213,24 @@
+@@ -195,6 +215,25 @@ arm_prelink_rela (struct prelink_info *i
        write_le32 (dso, rela->r_offset,
  		  (read_ule32 (dso, rela->r_offset) & 0xff000000) | val);
        break;
 +    case R_ARM_TLS_DTPOFF32:
-+      write_le32 (dso, rela->r_offset, value + rela->r_addend);
++      if (dso->ehdr.e_type == ET_EXEC)
++	write_le32 (dso, rela->r_offset, value + rela->r_addend);
 +      break;
-+    /* DTPMOD32 and TPOFF32 is impossible to predict unless prelink
++    /* DTPMOD32 and TPOFF32 are impossible to predict unless prelink
 +       sets the rules.  */
 +    case R_ARM_TLS_DTPMOD32:
 +      if (dso->ehdr.e_type == ET_EXEC)
@@ -47,12 +54,12 @@ Index: prelink-0.0.20050901/src/arch-arm
 +    case R_ARM_TLS_TPOFF32:
 +      if (dso->ehdr.e_type == ET_EXEC && info->resolvetls)
 +	write_le32 (dso, rela->r_offset,
-+		    -(value + rela->r_addend - info->resolvetls->offset));
++		    value + rela->r_addend + info->resolvetls->offset);
 +      break;
      case R_ARM_COPY:
        if (dso->ehdr.e_type == ET_EXEC)
  	/* COPY relocs are handled specially in generic code.  */
-@@ -315,6 +351,7 @@
+@@ -315,6 +354,7 @@ arm_prelink_conflict_rel (DSO *dso, stru
  {
    GElf_Addr value;
    struct prelink_conflict *conflict;
@@ -60,7 +67,7 @@ Index: prelink-0.0.20050901/src/arch-arm
    GElf_Rela *ret;
  
    if (GELF_R_TYPE (rel->r_info) == R_ARM_RELATIVE
-@@ -324,8 +361,31 @@
+@@ -324,8 +364,32 @@ arm_prelink_conflict_rel (DSO *dso, stru
    conflict = prelink_conflict (info, GELF_R_SYM (rel->r_info),
  			       GELF_R_TYPE (rel->r_info));
    if (conflict == NULL)
@@ -71,8 +78,9 @@ Index: prelink-0.0.20050901/src/arch-arm
 +	return 0;
 +      switch (GELF_R_TYPE (rel->r_info))
 +	{
-+	/* Even local DTPMOD and TPOFF relocs need conflicts.  */
++	/* Even local DTPMOD and {D,}TPOFF relocs need conflicts.  */
 +	case R_ARM_TLS_DTPMOD32:
++	case R_ARM_TLS_DTPOFF32:
 +	case R_ARM_TLS_TPOFF32:
 +	  break;
 +	default:
@@ -94,7 +102,7 @@ Index: prelink-0.0.20050901/src/arch-arm
    ret = prelink_conflict_add_rela (info);
    if (ret == NULL)
      return 1;
-@@ -342,6 +402,33 @@
+@@ -342,6 +406,33 @@ arm_prelink_conflict_rel (DSO *dso, stru
        error (0, 0, "%s: R_ARM_%s relocs should not be present in prelinked REL sections",
  	     dso->filename, GELF_R_TYPE (rel->r_info) == R_ARM_ABS32 ? "ABS32" : "PC24");
        return 1;
@@ -117,18 +125,18 @@ Index: prelink-0.0.20050901/src/arch-arm
 +	  ret->r_addend = tls->modid;
 +	  break;
 +	case R_ARM_TLS_DTPOFF32:
-+	  ret->r_addend = value;
++	  ret->r_addend = value + read_ule32 (dso, rel->r_offset);
 +	  break;
 +	case R_ARM_TLS_TPOFF32:
-+	  ret->r_addend = -(value + read_ule32 (dso, rel->r_offset)
-+			    - tls->offset);
++	  ret->r_addend = value + read_ule32 (dso, rel->r_offset)
++			    + tls->offset;
 +	  break;
 +	}
 +      break;
      case R_ARM_COPY:
        error (0, 0, "R_ARM_COPY should not be present in shared libraries");
        return 1;
-@@ -359,6 +446,7 @@
+@@ -359,6 +450,7 @@ arm_prelink_conflict_rela (DSO *dso, str
  {
    GElf_Addr value;
    struct prelink_conflict *conflict;
@@ -136,7 +144,7 @@ Index: prelink-0.0.20050901/src/arch-arm
    GElf_Rela *ret;
    Elf32_Sword val;
  
-@@ -369,8 +457,31 @@
+@@ -369,8 +461,32 @@ arm_prelink_conflict_rela (DSO *dso, str
    conflict = prelink_conflict (info, GELF_R_SYM (rela->r_info),
  			       GELF_R_TYPE (rela->r_info));
    if (conflict == NULL)
@@ -147,8 +155,9 @@ Index: prelink-0.0.20050901/src/arch-arm
 +	return 0;
 +      switch (GELF_R_TYPE (rela->r_info))
 +	{
-+	/* Even local DTPMOD and TPOFF relocs need conflicts.  */
++	/* Even local DTPMOD and {D,}TPOFF relocs need conflicts.  */
 +	case R_ARM_TLS_DTPMOD32:
++	case R_ARM_TLS_DTPOFF32:
 +	case R_ARM_TLS_TPOFF32:
 +	  break;
 +	default:
@@ -170,7 +179,7 @@ Index: prelink-0.0.20050901/src/arch-arm
    ret = prelink_conflict_add_rela (info);
    if (ret == NULL)
      return 1;
-@@ -398,6 +509,32 @@
+@@ -398,6 +514,32 @@ arm_prelink_conflict_rela (DSO *dso, str
      case R_ARM_COPY:
        error (0, 0, "R_ARM_COPY should not be present in shared libraries");
        return 1;
@@ -193,78 +202,80 @@ Index: prelink-0.0.20050901/src/arch-arm
 +	  ret->r_addend = tls->modid;
 +	  break;
 +	case R_ARM_TLS_DTPOFF32:
-+	  ret->r_addend += value;
++	  ret->r_addend = value + rela->r_addend;
 +	  break;
 +	case R_ARM_TLS_TPOFF32:
-+	  ret->r_addend = -(value + rela->r_addend - tls->offset);
++	  ret->r_addend = value + rela->r_addend + tls->offset;
 +	  break;
 +	}
 +      break;
      default:
        error (0, 0, "%s: Unknown arm relocation type %d", dso->filename,
  	     (int) GELF_R_TYPE (rela->r_info));
-@@ -418,6 +555,7 @@
+@@ -418,6 +560,8 @@ arm_rel_to_rela (DSO *dso, GElf_Rel *rel
        abort ();
      case R_ARM_RELATIVE:
      case R_ARM_ABS32:
 +    case R_ARM_TLS_TPOFF32:
++    case R_ARM_TLS_DTPOFF32:
        rela->r_addend = (Elf32_Sword) read_ule32 (dso, rel->r_offset);
        break;
      case R_ARM_PC24:
-@@ -426,6 +564,8 @@
+@@ -426,6 +570,7 @@ arm_rel_to_rela (DSO *dso, GElf_Rel *rel
        break;
      case R_ARM_COPY:
      case R_ARM_GLOB_DAT:
-+    case R_ARM_TLS_DTPOFF32:
 +    case R_ARM_TLS_DTPMOD32:
        rela->r_addend = 0;
        break;
      }
-@@ -445,6 +585,7 @@
+@@ -445,6 +590,8 @@ arm_rela_to_rel (DSO *dso, GElf_Rela *re
        abort ();
      case R_ARM_RELATIVE:
      case R_ARM_ABS32:
 +    case R_ARM_TLS_TPOFF32:
++    case R_ARM_TLS_DTPOFF32:
        write_le32 (dso, rela->r_offset, rela->r_addend);
        break;
      case R_ARM_PC24:
-@@ -453,6 +594,8 @@
+@@ -453,6 +600,7 @@ arm_rela_to_rel (DSO *dso, GElf_Rela *re
  		  | ((rela->r_addend >> 2) & 0xffffff));
        break;
      case R_ARM_GLOB_DAT:
 +    case R_ARM_TLS_DTPMOD32:
-+    case R_ARM_TLS_DTPOFF32:
        write_le32 (dso, rela->r_offset, 0);
        break;
      }
-@@ -488,6 +631,13 @@
+@@ -488,6 +636,15 @@ arm_need_rel_to_rela (DSO *dso, int firs
  		/* FALLTHROUGH */
  	      case R_ARM_PC24:
  		return 1;
++	      case R_ARM_TLS_DTPOFF32:
 +	      case R_ARM_TLS_TPOFF32:
-+		/* In shared libraries TPOFF is changed always into
++		/* In shared libraries {D,}TPOFF32 is changed always into
 +		   conflicts, for executables we need to preserve
 +		   original addend.  */
-+		if (dso->ehdr.e_type == ET_EXEC)
++		if (dso->ehdr.e_type == ET_EXEC) {
 +		  return 1;
++		}
 +		break;
  	      }
  	}
      }
-@@ -612,6 +762,12 @@
+@@ -612,6 +769,12 @@ arm_undo_prelink_rel (DSO *dso, GElf_Rel
  	return 0;
        error (0, 0, "%s: R_ARM_COPY reloc in shared library?", dso->filename);
        return 1;
 +    case R_ARM_TLS_DTPMOD32:
-+    case R_ARM_TLS_DTPOFF32:
 +      write_le32 (dso, rel->r_offset, 0);
 +      break;
++    case R_ARM_TLS_DTPOFF32:
 +    case R_ARM_TLS_TPOFF32:
 +      break;
      default:
        error (0, 0, "%s: Unknown arm relocation type %d", dso->filename,
  	     (int) GELF_R_TYPE (rel->r_info));
-@@ -634,6 +790,10 @@
+@@ -634,6 +797,10 @@ arm_reloc_class (int reloc_type)
      {
      case R_ARM_COPY: return RTYPE_CLASS_COPY;
      case R_ARM_JUMP_SLOT: return RTYPE_CLASS_PLT;
@@ -275,7 +286,7 @@ Index: prelink-0.0.20050901/src/arch-arm
      default: return RTYPE_CLASS_VALID;
      }
  }
-@@ -646,7 +806,7 @@
+@@ -646,7 +813,7 @@ PL_ARCH = {
    .R_JMP_SLOT = R_ARM_JUMP_SLOT,
    .R_COPY = R_ARM_COPY,
    .R_RELATIVE = R_ARM_RELATIVE,
============================================================
--- packages/prelink/prelink_20060712.bb	39f815f5486961924f46aadcc0d4245c808b5667
+++ packages/prelink/prelink_20061027.bb	f1e5e6b4ecc0058d522c825034b33534b8866429
@@ -1,10 +1,10 @@ LICENSE = "GPL"
 SECTION = "devel"
 DEPENDS = "elfutils"
 DESCRIPTION = " The prelink package contains a utility which modifies ELF shared libraries \
 and executables, so that far fewer relocations need to be resolved at \
 runtime and thus programs come up faster."
 LICENSE = "GPL"
-PR = "r2"
+PR = "r5"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/p/prelink/prelink_0.0.${PV}.orig.tar.gz \
            file://prelink.conf \
@@ -19,7 +19,7 @@ EXTRA_OECONF = "--disable-64bit"
 
 EXTRA_OECONF = "--disable-64bit"
 
-inherit autotools
+inherit autotools 
 
 do_install_append () {
 	install -d ${D}${sysconfdir}/cron.daily ${D}${sysconfdir}/default
============================================================
--- packages/qt4/qt_packaging.inc	b7908307df304cf7663fbeed5aa0765694bc334f
+++ packages/qt4/qt_packaging.inc	10c4b21735e8cff175978c971577e1cac4681cad
@@ -8,13 +8,6 @@ NONDEV_PACKAGES += "${QT_BASE_LIB}core4 
              ${QT_BASE_NAME}-demos ${QT_BASE_NAME}-examples \
              ${QT_BASE_NAME}-linguist \
              ${QT_BASE_NAME}-pixeltool ${QT_BASE_NAME}-dbus \
-             ${QT_BASE_NAME}-plugins-accessible \
-             ${QT_BASE_NAME}-plugins-codecs \
-             ${QT_BASE_NAME}-plugins-designer \
-             ${QT_BASE_NAME}-plugins-imageformats \
-             ${QT_BASE_NAME}-plugins-sqldrivers \
-             ${QT_BASE_NAME}-plugins-inputmethods \
-             ${QT_BASE_NAME}-plugins-iconengines \
              ${QT_BASE_NAME}-fonts "
 
 DEV_PACKAGES += "${QT_BASE_LIB}core4-dev \
@@ -46,7 +39,7 @@ DBG_PACKAGES += "${QT_BASE_LIB}core4-dbg
              ${QT_BASE_LIB}assistantclient4-dbg \
              ${QT_BASE_LIB}script4-dbg \
              ${QT_BASE_LIB}dbus4-dbg \
-             ${QT_BASE_LIB}opengl4-dbg "
+             ${QT_BASE_LIB}opengl4-dbg"
 
 
 PACKAGES += "${DEV_PACKAGES} ${NONDEV_PACKAGES} ${DBG_PACKAGES}"
@@ -54,7 +47,7 @@ FILES_${PN}-dev = " ${includedir}/${QT_D
 ALLOW_EMPTY_${PN} = "1"
 FILES_${PN}     = ""
 FILES_${PN}-dev = " ${includedir}/${QT_DIR_NAME}/Qt/*"
-FILES_${PN}-dbg = "${bindir}/*/.debug ${libdir}/${QT_DIR_NAME}/plugins/*/.debug/*.so"
+FILES_${PN}-dbg = "${bindir}/*/.debug "
 RDEPENDS_${PN} = "${NONDEV_PACKAGES}"
 RDEPENDS_${PN}-dev = "${DEV_PACKAGES}"
 RDEPENDS_${PN}-dbg = "${DBG_PACKAGES}"
@@ -112,14 +105,6 @@ FILES_${QT_BASE_LIB}uitools4-dev        
 FILES_${QT_BASE_LIB}uitools4-dev            = "${libdir}/libQtUiTools* ${includedir}/${QT_DIR_NAME}/QtUiTools* ${libdir}/pkgconfig/QtUiTools${QT_LIBINFIX}.pc"
 
 
-FILES_${QT_BASE_NAME}-plugins-accessible   = "${libdir}/${QT_DIR_NAME}/plugins/accessible/*.so"
-FILES_${QT_BASE_NAME}-plugins-codecs %s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list