Skip to contentSkip to conversation

Recipes upgrades and fixes

PATCH Superseded [email protected] 3 participants 18 messages Dec 30, 2011 – Jan 2, 2012 Arm STM32

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

[email protected]

author
#0 lore raw

cover Recipes upgrades and fixes

From: Nitin A Kamble <[email protected]>

Major part here is automake upgrade to 1.11.2. It broke few recipes as automake-1.11.2 has some deprications for some usages.
I fixed all the breakages for core-image-sato-sdk. Also checked that
these fixes continue to work with older automake 1.11.1.

Thanks,
Nitin

The following changes since commit f5aa3bbda623c8fae3a761d72fddc95631ad0706:

coreutils: ensure --color works so DEPEND on libcap (2011-12-24 10:05:47 +0000)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib nitin/upgrades+fixes
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=nitin/upgrades+fixes

Nitin A Kamble (14):
btrfs-tools: add attr as dependency to fix compilation
byacc: upgrade from 20110908 to 20111219 quilt upgreade from 0.48 to 0.50
rpm: fix build with automake-1.11.2 autotools.bbclass: fix cp error for empty dir
jpeg: fix configure with automake 1.11.2
avahi: fix configure with automake 1.11.2 misc patches: fix patch headers
perl: mark upstream status for all patches
gcc: mark upstream status for all patches
avahi-ui: fix build with automake-1.11.2
vte: upgrade from 0.24.3 to 0.28.2
systemtap: fix configure with automake 1.11.2
automake: upgrade from 1.11.1 to 1.11.2

 meta/classes/autotools.bbclass                     |    4 +-
 .../libacpi/files/libacpi_fix_for_x32.patch        |    2 +-
 .../use_correct_strip_in_cross_environment.patch   |    2 +-
 meta/recipes-connectivity/avahi/avahi-ui_0.6.30.bb |    3 +-
 meta/recipes-connectivity/avahi/avahi.inc          |    5 +-
 .../avahi/files/fix_for_automake_1.11.2.patch      |   44 ++++++++++++++++
 .../openssl-1.0.0e/openssl_fix_for_x32.patch       |    2 +-
 .../glib-2.0/glib-2.0/glib-2.0_fix_for_x32.patch   |    2 +-
 .../jpeg/jpeg-8c/fix_for_automake_1.11.2.patch     |   28 ++++++++++
 meta/recipes-core/jpeg/jpeg_8c.bb                  |    5 +-
 meta/recipes-devtools/automake/automake.inc        |    1 -
 .../{automake_1.11.1.bb => automake_1.11.2.bb}     |    5 +-
 .../btrfs-tools/btrfs-tools_git.bb                 |    4 +-
 .../dosfstools/fix_populated_dosfs_creation.patch  |    2 +-
 .../gcc/gcc-4.6/gcc-arm-set-cost.patch             |    1 +
 meta/recipes-devtools/gcc/gcc-4.6/pr32219.patch    |    1 +
 meta/recipes-devtools/gcc/gcc-4.6/pr46934.patch    |    1 +
 meta/recipes-devtools/gcc/gcc-4.6/pr47551.patch    |    1 +
 .../debian/arm_thread_stress_timeout.diff          |    1 +
 .../perl-5.14.2/debian/cpan_definstalldirs.diff    |    1 +
 .../perl-5.14.2/debian/cpanplus_config_path.diff   |    1 +
 .../debian/cpanplus_definstalldirs.diff            |    1 +
 .../perl/perl-5.14.2/debian/db_file_ver.diff       |    1 +
 .../perl-5.14.2/debian/deprecate-with-apt.diff     |    1 +
 .../perl-5.14.2/debian/disable-zlib-bundling.diff  |    1 +
 .../perl/perl-5.14.2/debian/doc_info.diff          |    1 +
 .../perl/perl-5.14.2/debian/enc2xs_inc.diff        |    1 +
 .../perl/perl-5.14.2/debian/errno_ver.diff         |    1 +
 .../debian/extutils_set_libperl_path.diff          |    1 +
 .../perl/perl-5.14.2/debian/fakeroot.diff          |    1 +
 .../perl/perl-5.14.2/debian/find_html2text.diff    |    1 +
 .../debian/fixes/document_makemaker_ccflags.diff   |    1 +
 .../debian/fixes/extutils-cbuilder-cflags.diff     |    1 +
 .../perl-5.14.2/debian/fixes/h2ph-multiarch.diff   |    1 +
 .../perl-5.14.2/debian/fixes/hurd-ccflags.diff     |    1 +
 .../perl/perl-5.14.2/debian/fixes/hurd-hints.diff  |    1 +
 .../perl-5.14.2/debian/fixes/index-tainting.diff   |    1 +
 .../debian/fixes/module-build-home-directory.diff  |    1 +
 .../perl-5.14.2/debian/fixes/net_smtp_docs.diff    |    1 +
 .../perl/perl-5.14.2/debian/fixes/pod_fixes.diff   |    1 +
 .../perl-5.14.2/debian/fixes/respect_umask.diff    |    1 +
 .../fixes/sys-syslog-socket-timeout-kfreebsd.patch |    1 +
 .../perl/perl-5.14.2/debian/instmodsh_doc.diff     |    1 +
 .../perl/perl-5.14.2/debian/ld_run_path.diff       |    1 +
 .../perl-5.14.2/debian/libnet_config_path.diff     |    1 +
 .../perl/perl-5.14.2/debian/libperl_embed_doc.diff |    1 +
 .../perl-5.14.2/debian/m68k_thread_stress.diff     |    1 +
 .../perl/perl-5.14.2/debian/mod_paths.diff         |    1 +
 .../debian/module_build_man_extensions.diff        |    1 +
 .../perl-5.14.2/debian/no_packlist_perllocal.diff  |    1 +
 .../perl/perl-5.14.2/debian/patchlevel.diff        |    1 +
 .../perl/perl-5.14.2/debian/perlivp.diff           |    1 +
 .../perl/perl-5.14.2/debian/prefix_changes.diff    |    1 +
 .../perl/perl-5.14.2/debian/prune_libs.diff        |    1 +
 .../perl-5.14.2/debian/skip-kfreebsd-crash.diff    |    1 +
 .../debian/skip-upstream-git-tests.diff            |    1 +
 .../debian/squelch-locale-warnings.diff            |    1 +
 .../perl-5.14.2/debian/writable_site_dirs.diff     |    1 +
 .../quilt/{quilt.inc => quilt-0.50.inc}            |    6 ++-
 meta/recipes-devtools/quilt/quilt-native_0.48.bb   |    7 ---
 meta/recipes-devtools/quilt/quilt-native_0.50.bb   |    4 ++
 .../quilt/quilt/gnu_patch_test_fix.patch           |   21 --------
 meta/recipes-devtools/quilt/quilt_0.48.bb          |   13 -----
 meta/recipes-devtools/quilt/quilt_0.50.bb          |    7 +++
 .../rpm/rpm/fix_for_automake_1.11.2.patch          |   54 ++++++++++++++++++++
 meta/recipes-devtools/rpm/rpm_5.4.0.bb             |    3 +-
 .../byacc/{byacc_20110908.bb => byacc_20111219.bb} |    6 +-
 .../findutils-4.4.2/findutils_fix_for_x32.patch    |    2 +-
 .../mdadm/files/mdadm-3.2.2_fix_for_x32.patch      |    2 +-
 .../pax/pax/pax-3.4_fix_for_x32.patch              |    2 +-
 .../mesa/mesa/mesa_fix_for_x32.patch               |    2 +-
 .../xorg-lib/libxt/libxt_fix_for_x32.patch         |    2 +-
 .../xorg-proto/xproto/xproto_fix_for_x32.patch     |    2 +-
 .../systemtap/fix_for_automake_1.11.2.patch        |   46 +++++++++++++++++
 meta/recipes-kernel/systemtap/systemtap_git.bb     |    3 +-
 .../pulseaudio/pulseaudo_fix_for_x32.patch         |    2 +-
 meta/recipes-support/gmp/gmp/gmp_bugfix.patch      |    2 +-
 meta/recipes-support/vte/vte.inc                   |    2 +-
 meta/recipes-support/vte/vte_0.24.3.bb             |    8 ---
 meta/recipes-support/vte/vte_0.28.2.bb             |   10 ++++
 80 files changed, 277 insertions(+), 82 deletions(-)
 create mode 100644 meta/recipes-connectivity/avahi/files/fix_for_automake_1.11.2.patch
 create mode 100644 meta/recipes-core/jpeg/jpeg-8c/fix_for_automake_1.11.2.patch
 rename meta/recipes-devtools/automake/{automake_1.11.1.bb => automake_1.11.2.bb} (88%)
 rename meta/recipes-devtools/quilt/{quilt.inc => quilt-0.50.inc} (82%)
 delete mode 100644 meta/recipes-devtools/quilt/quilt-native_0.48.bb
 create mode 100644 meta/recipes-devtools/quilt/quilt-native_0.50.bb
 delete mode 100644 meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix.patch
 delete mode 100644 meta/recipes-devtools/quilt/quilt_0.48.bb
 create mode 100644 meta/recipes-devtools/quilt/quilt_0.50.bb
 create mode 100644 meta/recipes-devtools/rpm/rpm/fix_for_automake_1.11.2.patch
 rename meta/recipes-extended/byacc/{byacc_20110908.bb => byacc_20111219.bb} (73%)
 create mode 100644 meta/recipes-kernel/systemtap/systemtap/fix_for_automake_1.11.2.patch
 delete mode 100644 meta/recipes-support/vte/vte_0.24.3.bb
 create mode 100644 meta/recipes-support/vte/vte_0.28.2.bb
Signature · 1 line
1.7.6.4
author
#1 lore raw

PATCH 1/14 btrfs-tools: add attr as dependency to fix compilation

From: Nitin A Kamble <[email protected]>

Fixes this compilation error:

| mkfs.c:39:24: fatal error: attr/xattr.h: No such file or directory
| compilation terminated.
| make: *** [mkfs.o] Error 1
Signed-off-by Nitin A Kamble <[email protected]>
---
 .../btrfs-tools/btrfs-tools_git.bb                 |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb +2 -2
index 0ae570d..b2e503b 100644
@@ -10,13 +10,13 @@ HOMEPAGE = "https://btrfs.wiki.kernel.org"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=fcb02dc552a041dee27e4b85c7396067"
 SECTION = "base"
-DEPENDS = "util-linux"
+DEPENDS = "util-linux attr"
 
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git;protocol=git;tag=13eced9a0c2b6bd6bc38e6f0f46a1977b1167e67;branch=master"
 
 S = "${WORKDIR}/git"
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI += " file://fix_use_of_gcc.patch \
 	 file://weak-defaults.patch "
Signature · 1 line
1.7.6.4
author
#2 lore raw

PATCH 2/14 byacc: upgrade from 20110908 to 20111219

From: Nitin A Kamble <[email protected]>

Signed-off-by Nitin A Kamble <[email protected]>
---
 .../byacc/{byacc_20110908.bb => byacc_20111219.bb} |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-extended/byacc/{byacc_20110908.bb => byacc_20111219.bb} (73%)
meta/recipes-extended/byacc/byacc_20111219.bb renamed from meta/recipes-extended/byacc/byacc_20110908.bb +3 -3
similarity index 73%
rename from meta/recipes-extended/byacc/byacc_20110908.bb
rename to meta/recipes-extended/byacc/byacc_20111219.bb
index 5e01c25..4b317c4 100644
@@ -1,4 +1,4 @@
-PR = "r1"
+PR = "r0"
 
 # Sigh. This is one of those places where everyone licenses it differently. Someone
 # even apply UCB to it (Free/Net/OpenBSD). The maintainer states that:

@@ -9,5 +9,5 @@ LICENSE="PD"
 LIC_FILES_CHKSUM = "file://package/debian/copyright;md5=4dc4c30f840a7203fb6edf20b3db849e"
 require byacc.inc
 
-SRC_URI[md5sum] = "5665ee1f2ca482d57eef9591a2fe4768"
-SRC_URI[sha256sum] = "70a3e491ddfae9da04646abe769fa0ecb9cbf003e2a09c5732907e3e8b478fb0"
+SRC_URI[md5sum] = "c17542fd9df6e392d495a64f883e29f1"
+SRC_URI[sha256sum] = "ca37eb3702a02efe4a4dd09e0ef26fc91e4c22c36d8d52e45d2f76923fbd99d9"
Signature · 1 line
1.7.6.4
author
#3 lore raw

PATCH 3/14 quilt upgreade from 0.48 to 0.50

In reply to [email protected]

From: Nitin A Kamble <[email protected]>

gnu_patch_test_fix.patch : this patch removed as it is already upstream now.

Renamed quilt.inc to quilt-0.50.inc and moved the dupicate information from native & target recipe files into the quilt-0.50.inc file.

Signed-off-by Nitin A Kamble <[email protected]>
---
 .../quilt/{quilt.inc => quilt-0.50.inc}            |    6 +++-
 meta/recipes-devtools/quilt/quilt-native_0.48.bb   |    7 ------
 meta/recipes-devtools/quilt/quilt-native_0.50.bb   |    4 +++
 .../quilt/quilt/gnu_patch_test_fix.patch           |   21 --------------------
 meta/recipes-devtools/quilt/quilt_0.48.bb          |   13 ------------
 meta/recipes-devtools/quilt/quilt_0.50.bb          |    7 ++++++
 6 files changed, 15 insertions(+), 43 deletions(-)
 rename meta/recipes-devtools/quilt/{quilt.inc => quilt-0.50.inc} (82%)
 delete mode 100644 meta/recipes-devtools/quilt/quilt-native_0.48.bb
 create mode 100644 meta/recipes-devtools/quilt/quilt-native_0.50.bb
 delete mode 100644 meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix.patch
 delete mode 100644 meta/recipes-devtools/quilt/quilt_0.48.bb
 create mode 100644 meta/recipes-devtools/quilt/quilt_0.50.bb
meta/recipes-devtools/quilt/quilt-0.50.inc renamed from meta/recipes-devtools/quilt/quilt.inc +4 -2
similarity index 82%
rename from meta/recipes-devtools/quilt/quilt.inc
rename to meta/recipes-devtools/quilt/quilt-0.50.inc
index 3a66093..9ba98f8 100644
@@ -5,8 +5,10 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
 SRC_URI = "http://download.savannah.gnu.org/releases/quilt/quilt-${PV}.tar.gz \
-        file://install.patch \
-        file://gnu_patch_test_fix.patch"
+        file://install.patch"
+
+SRC_URI[md5sum] = "ff5e1e041363c3af3c8fda4b968c9d1d"
+SRC_URI[sha256sum] = "fa4579628a98cf94472b36869e74f5cd0cb057d6fd13c1872a53f01c45aba8c3"
 
 inherit autotools
meta/recipes-devtools/quilt/quilt-native_0.48.bb deleted +0 -7
deleted file mode 100644
index a62531e..0000000
@@ -1,7 +0,0 @@
-require quilt.inc
-require quilt-native.inc
-
-PR = "r0"
-
-SRC_URI[md5sum] = "f77adda60039ffa753f3c584a286f12b"
-SRC_URI[sha256sum] = "73fd760d3b5cbf06417576591dc37d67380d189392db9000c21b7cbebee49ffc"
meta/recipes-devtools/quilt/quilt-native_0.50.bb new file +4 -0
new file mode 100644
index 0000000..b99b9b6
@@ -0,0 +1,4 @@
+require quilt-${PV}.inc
+require quilt-native.inc
+
+PR = "r0"
meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix.patch deleted +0 -21
deleted file mode 100644
index 348b327..0000000
@@ -1,21 +0,0 @@
-Upstream-Status: Pending
-
-# quilt's configure tosses an error with patch @ GNU patch 2.6.1.81-5b68
-#
-# Signed-off-by: Elizabeth Flanagan <[email protected]>
---- quilt-0.48/configure	2010-11-03 11:50:55.280329802 -0700
-+++ quilt-0.48/configure	2010-11-03 11:52:43.705354080 -0700
-@@ -5896,7 +5896,12 @@
- echo $ECHO_N "checking the version of $PATCH... $ECHO_C" >&6; }
- if $PATCH --version 2> /dev/null | grep GNU >/dev/null; then
-   set -- `$PATCH --version 2> /dev/null`
--  patch_version=$2
-+  #
-+  if test x$1 = xGNU ; then
-+    patch_version=$3
-+  else
-+    patch_version=$2
-+  fi
-   { echo "$as_me:$LINENO: result: $patch_version" >&5
- echo "${ECHO_T}$patch_version" >&6; }
-   saved_IFS=$IFS; IFS='.'
meta/recipes-devtools/quilt/quilt_0.48.bb deleted +0 -13
deleted file mode 100644
index 1600c62..0000000
@@ -1,13 +0,0 @@
-require quilt.inc
-LICENSE="GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-RDEPENDS_${PN} += "patch diffstat bzip2 util-linux"
-PR = "r2"
-SRC_URI += "file://aclocal.patch \
-            file://gnu_patch_test_fix_target.patch \
-           "
-
-SRC_URI[md5sum] = "f77adda60039ffa753f3c584a286f12b"
-SRC_URI[sha256sum] = "73fd760d3b5cbf06417576591dc37d67380d189392db9000c21b7cbebee49ffc"
-
-inherit autotools gettext
meta/recipes-devtools/quilt/quilt_0.50.bb new file +7 -0
new file mode 100644
index 0000000..6691d15
@@ -0,0 +1,7 @@
+require quilt-${PV}.inc
+inherit gettext 
+RDEPENDS_${PN} += "patch diffstat bzip2 util-linux"
+SRC_URI += "file://aclocal.patch \
+            file://gnu_patch_test_fix_target.patch \
+           "
+PR = "r0"
Signature · 1 line
1.7.6.4
#4 lore raw

Re: [PATCH 03/14] quilt upgreade from 0.48 to 0.50

Quoted 8 lines · On 12/29/2011 04:30 PM, [email protected] wrote:

From: Nitin A Kamble<[email protected]>

gnu_patch_test_fix.patch : this patch removed as it is already upstream now.

Renamed quilt.inc to quilt-0.50.inc and moved the dupicate information from native& target recipe files into the quilt-0.50.inc file.

There are some packaging warning for non-shipped items. The best solution may be to remove the directory & files (/usr/share/emacs/...) in a do_install_append().

Sau!

Quoted 118 lines
Signed-off-by Nitin A Kamble<[email protected]>
---
  .../quilt/{quilt.inc =>  quilt-0.50.inc}            |    6 +++-
  meta/recipes-devtools/quilt/quilt-native_0.48.bb   |    7 ------
  meta/recipes-devtools/quilt/quilt-native_0.50.bb   |    4 +++
  .../quilt/quilt/gnu_patch_test_fix.patch           |   21 --------------------
  meta/recipes-devtools/quilt/quilt_0.48.bb          |   13 ------------
  meta/recipes-devtools/quilt/quilt_0.50.bb          |    7 ++++++
  6 files changed, 15 insertions(+), 43 deletions(-)

rename meta/recipes-devtools/quilt/{quilt.inc => quilt-0.50.inc} (82%) delete mode 100644 meta/recipes-devtools/quilt/quilt-native_0.48.bb create mode 100644 meta/recipes-devtools/quilt/quilt-native_0.50.bb delete mode 100644 meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix.patch delete mode 100644 meta/recipes-devtools/quilt/quilt_0.48.bb create mode 100644 meta/recipes-devtools/quilt/quilt_0.50.bb

meta/recipes-devtools/quilt/quilt-0.50.inc renamed from meta/recipes-devtools/quilt/quilt.inc +4 -2
similarity index 82%
rename from meta/recipes-devtools/quilt/quilt.inc
rename to meta/recipes-devtools/quilt/quilt-0.50.inc
index 3a66093..9ba98f8 100644
@@ -5,8 +5,10 @@ LICENSE = "GPLv2"
  LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
  SRC_URI = "http://download.savannah.gnu.org/releases/quilt/quilt-${PV}.tar.gz \
-        file://install.patch \
-        file://gnu_patch_test_fix.patch"
+        file://install.patch"
+
+SRC_URI[md5sum] = "ff5e1e041363c3af3c8fda4b968c9d1d"
+SRC_URI[sha256sum] = "fa4579628a98cf94472b36869e74f5cd0cb057d6fd13c1872a53f01c45aba8c3"
 
  inherit autotools
meta/recipes-devtools/quilt/quilt-native_0.48.bb deleted +0 -7
deleted file mode 100644
index a62531e..0000000
@@ -1,7 +0,0 @@
-require quilt.inc
-require quilt-native.inc
-
-PR = "r0"
-
-SRC_URI[md5sum] = "f77adda60039ffa753f3c584a286f12b"
-SRC_URI[sha256sum] = "73fd760d3b5cbf06417576591dc37d67380d189392db9000c21b7cbebee49ffc"
meta/recipes-devtools/quilt/quilt-native_0.50.bb new file +4 -0
new file mode 100644
index 0000000..b99b9b6
@@ -0,0 +1,4 @@
+require quilt-${PV}.inc
+require quilt-native.inc
+
+PR = "r0"
meta/recipes-devtools/quilt/quilt/gnu_patch_test_fix.patch deleted +0 -21
deleted file mode 100644
index 348b327..0000000
@@ -1,21 +0,0 @@
-Upstream-Status: Pending
-
-# quilt's configure tosses an error with patch @ GNU patch 2.6.1.81-5b68
-#
-# Signed-off-by: Elizabeth Flanagan<[email protected]>
---- quilt-0.48/configure	2010-11-03 11:50:55.280329802 -0700
-+++ quilt-0.48/configure	2010-11-03 11:52:43.705354080 -0700
-@@ -5896,7 +5896,12 @@
- echo $ECHO_N "checking the version of $PATCH... $ECHO_C">&6; }
- if $PATCH --version 2>  /dev/null | grep GNU>/dev/null; then
-   set -- `$PATCH --version 2>  /dev/null`
--  patch_version=$2
-+  #
-+  if test x$1 = xGNU ; then
-+    patch_version=$3
-+  else
-+    patch_version=$2
-+  fi
-   { echo "$as_me:$LINENO: result: $patch_version">&5
- echo "${ECHO_T}$patch_version">&6; }
-   saved_IFS=$IFS; IFS='.'
meta/recipes-devtools/quilt/quilt_0.48.bb deleted +0 -13
deleted file mode 100644
index 1600c62..0000000
@@ -1,13 +0,0 @@
-require quilt.inc
-LICENSE="GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-RDEPENDS_${PN} += "patch diffstat bzip2 util-linux"
-PR = "r2"
-SRC_URI += "file://aclocal.patch \
-            file://gnu_patch_test_fix_target.patch \
-           "
-
-SRC_URI[md5sum] = "f77adda60039ffa753f3c584a286f12b"
-SRC_URI[sha256sum] = "73fd760d3b5cbf06417576591dc37d67380d189392db9000c21b7cbebee49ffc"
-
-inherit autotools gettext
meta/recipes-devtools/quilt/quilt_0.50.bb new file +7 -0
new file mode 100644
index 0000000..6691d15
@@ -0,0 +1,7 @@
+require quilt-${PV}.inc
+inherit gettext
+RDEPENDS_${PN} += "patch diffstat bzip2 util-linux"
+SRC_URI += "file://aclocal.patch \
+            file://gnu_patch_test_fix_target.patch \
+           "
+PR = "r0"
author
#5 lore raw

PATCH 4/14 rpm: fix build with automake-1.11.2

In reply to [email protected]

From: Nitin A Kamble <[email protected]>

automake version 1.11.2 has made use of dir variables more strict. the use of pkglibdir with SCRIPTS & DATA vars results in automake errors.
This commits uses pkgdatadir & pkgbindir vars instead of pkglibdir
to avoid the strict check errors.
This change also works with automake-1.11.1

Signed-off-by Nitin A Kamble <[email protected]>
---
 .../rpm/rpm/fix_for_automake_1.11.2.patch          |   54 ++++++++++++++++++++
 meta/recipes-devtools/rpm/rpm_5.4.0.bb             |    3 +-
 2 files changed, 56 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-devtools/rpm/rpm/fix_for_automake_1.11.2.patch
meta/recipes-devtools/rpm/rpm/fix_for_automake_1.11.2.patch new file +54 -0
new file mode 100644
index 0000000..bb0f7eb
@@ -0,0 +1,54 @@
+Upstream-Status: Pending
+
+automake version 1.11.2 has made use of dir variables more strict.
+the use of pkglibdir with SCRIPTS & DATA vars results in automake
+errors.
+  This commits uses pkgdatadir & pkgbindir vars instead of pkglibdir
+to avoid the strict check errors.
+
+  This change also works with automake-1.11.1
+
+Errors fixed:
+Makefile.am:103: error: `pkglibdir' is not a legitimate directory for `DATA'
+scripts/Makefile.am:47: error: `pkglibdir' is not a legitimate directory for `SCRIPTS'
+
+Signed-Off-By: Nitin A Kamble <[email protected]>
+2011/12/27
+
+Index: rpm-5.4.0/Makefile.am
+===================================================================
+--- rpm-5.4.0.orig/Makefile.am
++++ rpm-5.4.0/Makefile.am
+@@ -103,13 +103,13 @@ if WITH_PATH_VERSIONED
+ 	done
+ endif
+ 
+-pkglibdir =		@USRLIBRPM@
+-pkglib_DATA = rpmpopt macros/macros macros/macros.rpmbuild cpuinfo.yaml
++pkgdatadir =		@USRLIBRPM@
++pkgdata_DATA = rpmpopt macros/macros macros/macros.rpmbuild cpuinfo.yaml
+ 
+-pkgbindir =	$(pkglibdir)/bin
++pkgbindir =	$(pkgdatadir)/bin
+ pkgbin_SCRIPTS = install-sh mkinstalldirs
+ 
+-pkgcfgdir =	$(pkglibdir)/macros.d
++pkgcfgdir =	$(pkgdatadir)/macros.d
+ pkgcfg_DATA = \
+ 	macros/cmake macros/java macros/libtool macros/mandriva macros/mono \
+ 	macros/perl macros/pkgconfig macros/php macros/python macros/ruby \
+Index: rpm-5.4.0/scripts/Makefile.am
+===================================================================
+--- rpm-5.4.0.orig/scripts/Makefile.am
++++ rpm-5.4.0/scripts/Makefile.am
+@@ -45,8 +45,8 @@ all:
+ 
+ bin_SCRIPTS = gendiff
+ 
+-pkglibdir =		@USRLIBRPM@
+-pkglib_SCRIPTS = \
++pkgbindir =		@USRLIBRPM@
++pkgbin_SCRIPTS = \
+ 	brp-compress brp-python-bytecompile brp-java-gcjcompile \
+ 	brp-strip brp-strip-comment-note brp-nobuildrootpath \
+ 	brp-strip-shared brp-strip-static-archive brp-sparc64-linux \
meta/recipes-devtools/rpm/rpm_5.4.0.bb +2 -1
index 122d3a9..34746c3 100644
@@ -45,7 +45,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
 DEPENDS = "bzip2 zlib db openssl elfutils expat libpcre attr acl popt ${extrarpmdeps}"
 extrarpmdeps = "python perl"
 extrarpmdeps_virtclass-native = "file-native"
-PR = "r27"
+PR = "r28"
 
 # rpm2cpio is a shell script, which is part of the rpm src.rpm.  It is needed
 # in order to extract the distribution SRPM into a format we can extract...

@@ -65,6 +65,7 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.0-0.20101229.src.rpm;ex
 	   file://rpm-canonarch.patch \
 	   file://rpm-no-loopmsg.patch \
 	   file://rpm-scriptletexechelper.patch \
+	   file://fix_for_automake_1.11.2.patch \
 	   file://pythondeps.sh \
 	  "
Signature · 1 line
1.7.6.4
author
#6 lore raw

PATCH 5/14 autotools.bbclass: fix cp error for empty dir

In reply to [email protected]

From: Nitin A Kamble <[email protected]>

the .../usr/share/aclocal is empty for build from scratch. so avoid cp error if the directory is empty.

Fixes this error, which is thrown before pseudo is built:

| cp: cannot stat `/builddisk/build/build0/tmp/sysroots/x86_64-linux/usr/share/aclocal/*':
No such file or directory
NOTE: package libtool-native-2.4.2-r0.0: task do_configure: Failed

Signed-off-by Nitin A Kamble <[email protected]>
---
 meta/classes/autotools.bbclass |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
meta/classes/autotools.bbclass +3 -1
index 7536bac..2f462ff 100644
@@ -122,7 +122,9 @@ autotools_do_configure() {
 			# We avoid this by taking a copy here and then files cannot disappear.
 			if [ -d ${STAGING_DATADIR}/aclocal ]; then
 				mkdir -p ${B}/aclocal-copy/
-				cp ${STAGING_DATADIR}/aclocal/* ${B}/aclocal-copy/
+				# for scratch build this directory can be empty
+				# so avoid cp's no files to copy error
+				cp -r ${STAGING_DATADIR}/aclocal/. ${B}/aclocal-copy/
 				acpaths="$acpaths -I ${B}/aclocal-copy/"
 			fi
 			# autoreconf is too shy to overwrite aclocal.m4 if it doesn't look
Signature · 1 line
1.7.6.4
author
#7 lore raw

PATCH 6/14 jpeg: fix configure with automake 1.11.2

In reply to [email protected]

From: Nitin A Kamble <[email protected]>

The support for automatic de-ANSI-fication has been deprecated in automake 1.11.2, and will be removed altogether in automake 1.12

This avoids this error:

| configure.ac:24: automatic de-ANSI-fication support is deprecated
| autoreconf: automake failed with exit status: 1
| ERROR: autoreconf execution failed.

NOTE: package jpeg-native-8c-r2: task do_configure: Failed

Signed-off-by Nitin A Kamble <[email protected]>
---
 .../jpeg/jpeg-8c/fix_for_automake_1.11.2.patch     |   28 ++++++++++++++++++++
 meta/recipes-core/jpeg/jpeg_8c.bb                  |    5 ++-
 2 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-core/jpeg/jpeg-8c/fix_for_automake_1.11.2.patch
meta/recipes-core/jpeg/jpeg-8c/fix_for_automake_1.11.2.patch new file +28 -0
new file mode 100644
index 0000000..c0d7f3e
@@ -0,0 +1,28 @@
+Upstream-Status: Pending
+
+The support for automatic de-ANSI-fication has been deprecated in
+automake 1.11.2, and will be removed altogether in automake 1.12
+
+This avoids this error:
+| configure.ac:24: automatic de-ANSI-fication support is deprecated
+| autoreconf: automake failed with exit status: 1
+| ERROR: autoreconf execution failed.
+NOTE: package jpeg-native-8c-r2: task do_configure: Failed
+
+Signed-Off-By: Nitin A Kamble <[email protected]>
+2011/12/28
+
+
+Index: jpeg-8c/configure.ac
+===================================================================
+--- jpeg-8c.orig/configure.ac
++++ jpeg-8c/configure.ac
+@@ -21,7 +21,7 @@ AC_CANONICAL_TARGET
+ 
+ # Initialize Automake
+ # Don't require all the GNU mandated files
+-AM_INIT_AUTOMAKE([-Wall -Werror ansi2knr no-dist foreign])
++AM_INIT_AUTOMAKE([-Wall -Werror no-dist foreign])
+ 
+ # Make --enable-silent-rules the default.
+ # To get verbose build output you may configure
meta/recipes-core/jpeg/jpeg_8c.bb +3 -2
index 1c242d1..6aeaeaa 100644
@@ -13,10 +13,11 @@ SECTION = "libs"
 DEPENDS = "libtool-cross"
 DEPENDS_virtclass-native = "libtool-native"
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://www.ijg.org/files/jpegsrc.v${PV}.tar.gz \
-	   file://debian-libjpeg7_7-1.diff;"
+	   file://debian-libjpeg7_7-1.diff \
+           file://fix_for_automake_1.11.2.patch"
 
 SRC_URI[md5sum] = "a2c10c04f396a9ce72894beb18b4e1f9"
 SRC_URI[sha256sum] = "edfc0b3e004b2fe58ffeeec89f96e3a3c28972c46725ec127d01edf8a1cc7c9a"
Signature · 1 line
1.7.6.4
author
#8 lore raw

PATCH 7/14 avahi: fix configure with automake 1.11.2

In reply to [email protected]

From: Nitin A Kamble <[email protected]>

automake version 1.11.2 has made use of dir variables more strict. use of pkglibdir with DATA var results in automake errors.
This commits uses pkgdatadir var instead of pkglibdir to avoid
the strict check errors.

Fixes this error:
service-type-database/Makefile.am:21: pkglibdir' is not a legitimate directory for DATA'
autoreconf: automake failed with exit status: 1
ERROR: autoreconf execution failed.

Signed-off-by Nitin A Kamble <[email protected]>
---
 meta/recipes-connectivity/avahi/avahi.inc          |    5 +-
 .../avahi/files/fix_for_automake_1.11.2.patch      |   44 ++++++++++++++++++++
 2 files changed, 47 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-connectivity/avahi/files/fix_for_automake_1.11.2.patch
meta/recipes-connectivity/avahi/avahi.inc +3 -2
index deebbd6..3cee1a4 100644
@@ -14,14 +14,15 @@ SECTION = "network"
 # python scripts are under GPLv2+
 LICENSE = "GPLv2+ & LGPLv2.1+"
 
-INC_PR = "r10"
+INC_PR = "r11"
 
 DEPENDS = "expat libcap libdaemon dbus glib-2.0"
 
 SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \
           file://00avahi-autoipd \
           file://99avahi-autoipd \
-          file://initscript.patch"
+          file://initscript.patch \
+          file://fix_for_automake_1.11.2.patch"
 
 USERADD_PACKAGES = "avahi-daemon"
 USERADD_PARAM_avahi-daemon = "--system --home /var/run/avahi-daemon \
meta/recipes-connectivity/avahi/files/fix_for_automake_1.11.2.patch new file +44 -0

44 lines not on this page · raw message

Signature · 1 line
1.7.6.4
author
#9 lore raw

PATCH 8/14 misc patches: fix patch headers

In reply to [email protected]

From: Nitin A Kamble <[email protected]>

These patches were marked by "UpstreamStatus:" line, fix it to use "Upstream-Status:" instead.

Signed-off-by Nitin A Kamble <[email protected]>
---
 .../libacpi/files/libacpi_fix_for_x32.patch        |    2 +-
 .../use_correct_strip_in_cross_environment.patch   |    2 +-
 .../openssl-1.0.0e/openssl_fix_for_x32.patch       |    2 +-
 .../glib-2.0/glib-2.0/glib-2.0_fix_for_x32.patch   |    2 +-
 .../dosfstools/fix_populated_dosfs_creation.patch  |    2 +-
 .../findutils-4.4.2/findutils_fix_for_x32.patch    |    2 +-
 .../mdadm/files/mdadm-3.2.2_fix_for_x32.patch      |    2 +-
 .../pax/pax/pax-3.4_fix_for_x32.patch              |    2 +-
 .../mesa/mesa/mesa_fix_for_x32.patch               |    2 +-
 .../xorg-lib/libxt/libxt_fix_for_x32.patch         |    2 +-
 .../xorg-proto/xproto/xproto_fix_for_x32.patch     |    2 +-
 .../pulseaudio/pulseaudo_fix_for_x32.patch         |    2 +-
 meta/recipes-support/gmp/gmp/gmp_bugfix.patch      |    2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)
meta/recipes-bsp/libacpi/files/libacpi_fix_for_x32.patch +1 -1
index 5f2d034..2fed344 100644
@@ -1,4 +1,4 @@
-UpstreamStatus: Pending
+Upstream-Status: Pending
 
 Fix libacpi for x32
meta/recipes-bsp/libacpi/files/use_correct_strip_in_cross_environment.patch +1 -1
index c9ad668..bca75fb 100644
@@ -1,4 +1,4 @@
-UpstreamStatus: Pending
+Upstream-Status: Pending
 
 Used the cross strip instead of host strip to avoid this build error:
meta/recipes-connectivity/openssl/openssl-1.0.0e/openssl_fix_for_x32.patch +1 -1
index 2dbcd01..3191ce9 100644
@@ -1,4 +1,4 @@
-UpstreamStatus: Pending
+Upstream-Status: Pending
 
 Received from H J Liu @ Intel
 Make the assembly syntax compatible with x32 gcc. Othewise x32 gcc throws errors.
meta/recipes-core/glib-2.0/glib-2.0/glib-2.0_fix_for_x32.patch +1 -1
index 70cbbbe..2920e2f 100644
@@ -1,4 +1,4 @@
-UpstreamStatus: Pending
+Upstream-Status: Pending
 
 Pass CC & CFLAGS vars so that tune parameters get used.
 This fixes compilation with x32 toolchain.
meta/recipes-devtools/dosfstools/dosfstools/fix_populated_dosfs_creation.patch +1 -1
index 510f12e..9d7f732 100644
@@ -1,4 +1,4 @@
-UpstreamStatus: Inappropriate
+Upstream-Status: Inappropriate
 
 This patch fixes populated dosfs image creation with directory 
 structures. Earlier it was causing segfault; and only image
meta/recipes-extended/findutils/findutils-4.4.2/findutils_fix_for_x32.patch +1 -1
index dd2ab0e..b78cc75 100644
@@ -1,4 +1,4 @@
-UpstreamStatus: Pending
+Upstream-Status: Pending
 
 Author: H.J. Lu <[email protected]>
meta/recipes-extended/mdadm/files/mdadm-3.2.2_fix_for_x32.patch +1 -1
index 79ba2cf..58d54f9 100644
@@ -1,4 +1,4 @@
-UpstreamStatus: pending
+Upstream-Status: pending
 
 By hardcoding CC's definition in the Makefile, all the gcc parameters 
 set by tune settings are lost. Causing compile failure with x32 toolchain
meta/recipes-extended/pax/pax/pax-3.4_fix_for_x32.patch +1 -1
index 11dfa0f..80878f3 100644
@@ -1,4 +1,4 @@
-UpstreamStatus: Pending
+Upstream-Status: Pending
 
 Author: H.J. Lu <[email protected]>
 Date:   Tue Dec 6 10:34:53 2011 -0800
meta/recipes-graphics/mesa/mesa/mesa_fix_for_x32.patch +1 -1
index dfd67fe..8994faf 100644
@@ -1,4 +1,4 @@
-UpstreamStatus: Pending
+Upstream-Status: Pending
 
 get correct compiler options for x32 gcc.
meta/recipes-graphics/xorg-lib/libxt/libxt_fix_for_x32.patch +1 -1
index 57ddbeb..ce6c756 100644
@@ -1,4 +1,4 @@
-UpstreamStatus: Pending
+Upstream-Status: Pending
 
 This fixes compilation with x32 toolchain.
meta/recipes-graphics/xorg-proto/xproto/xproto_fix_for_x32.patch +1 -1
index c9fbb6f..540ad27 100644
@@ -1,4 +1,4 @@
-UpstreamStatus: Pending
+Upstream-Status: Pending
 
 Don't always define LONG64 for AMD64
meta/recipes-multimedia/pulseaudio/pulseaudio/pulseaudo_fix_for_x32.patch +1 -1
index 39dad32..b68ac5b 100644
@@ -1,4 +1,4 @@
-UpstreamStatus: Pending
+Upstream-Status: Pending
 
 This patch makes assembly syntax compatible to the x32 toolchain.
meta/recipes-support/gmp/gmp/gmp_bugfix.patch +1 -1
index a96136f..329c880 100644
@@ -1,4 +1,4 @@
-UpstreamStatus: Pending
+Upstream-Status: Pending
 
 When LONG_MIN is passed to val, -val is undefined.  This patch fixes
 it.  See for details: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50066
Signature · 1 line
1.7.6.4
author
#10 lore raw

PATCH 9/14 perl: mark upstream status for all patches

In reply to [email protected]

From: Nitin A Kamble <[email protected]>

All the patches imported from debian source packages are marked accordingly.

Signed-off-by Nitin A Kamble <[email protected]>
---
 .../debian/arm_thread_stress_timeout.diff          |    1 +
 .../perl-5.14.2/debian/cpan_definstalldirs.diff    |    1 +
 .../perl-5.14.2/debian/cpanplus_config_path.diff   |    1 +
 .../debian/cpanplus_definstalldirs.diff            |    1 +
 .../perl/perl-5.14.2/debian/db_file_ver.diff       |    1 +
 .../perl-5.14.2/debian/deprecate-with-apt.diff     |    1 +
 .../perl-5.14.2/debian/disable-zlib-bundling.diff  |    1 +
 .../perl/perl-5.14.2/debian/doc_info.diff          |    1 +
 .../perl/perl-5.14.2/debian/enc2xs_inc.diff        |    1 +
 .../perl/perl-5.14.2/debian/errno_ver.diff         |    1 +
 .../debian/extutils_set_libperl_path.diff          |    1 +
 .../perl/perl-5.14.2/debian/fakeroot.diff          |    1 +
 .../perl/perl-5.14.2/debian/find_html2text.diff    |    1 +
 .../debian/fixes/document_makemaker_ccflags.diff   |    1 +
 .../debian/fixes/extutils-cbuilder-cflags.diff     |    1 +
 .../perl-5.14.2/debian/fixes/h2ph-multiarch.diff   |    1 +
 .../perl-5.14.2/debian/fixes/hurd-ccflags.diff     |    1 +
 .../perl/perl-5.14.2/debian/fixes/hurd-hints.diff  |    1 +
 .../perl-5.14.2/debian/fixes/index-tainting.diff   |    1 +
 .../debian/fixes/module-build-home-directory.diff  |    1 +
 .../perl-5.14.2/debian/fixes/net_smtp_docs.diff    |    1 +
 .../perl/perl-5.14.2/debian/fixes/pod_fixes.diff   |    1 +
 .../perl-5.14.2/debian/fixes/respect_umask.diff    |    1 +
 .../fixes/sys-syslog-socket-timeout-kfreebsd.patch |    1 +
 .../perl/perl-5.14.2/debian/instmodsh_doc.diff     |    1 +
 .../perl/perl-5.14.2/debian/ld_run_path.diff       |    1 +
 .../perl-5.14.2/debian/libnet_config_path.diff     |    1 +
 .../perl/perl-5.14.2/debian/libperl_embed_doc.diff |    1 +
 .../perl-5.14.2/debian/m68k_thread_stress.diff     |    1 +
 .../perl/perl-5.14.2/debian/mod_paths.diff         |    1 +
 .../debian/module_build_man_extensions.diff        |    1 +
 .../perl-5.14.2/debian/no_packlist_perllocal.diff  |    1 +
 .../perl/perl-5.14.2/debian/patchlevel.diff        |    1 +
 .../perl/perl-5.14.2/debian/perlivp.diff           |    1 +
 .../perl/perl-5.14.2/debian/prefix_changes.diff    |    1 +
 .../perl/perl-5.14.2/debian/prune_libs.diff        |    1 +
 .../perl-5.14.2/debian/skip-kfreebsd-crash.diff    |    1 +
 .../debian/skip-upstream-git-tests.diff            |    1 +
 .../debian/squelch-locale-warnings.diff            |    1 +
 .../perl-5.14.2/debian/writable_site_dirs.diff     |    1 +
 40 files changed, 40 insertions(+), 0 deletions(-)
meta/recipes-devtools/perl/perl-5.14.2/debian/arm_thread_stress_timeout.diff +1 -0
index 1d80e95..6e70c66 100644
@@ -1,3 +1,4 @@
+Upstream-Status:Inappropriate [debian patches]
 From f624a9f1206cdd44fde99c40d82e2f326db485dd Mon Sep 17 00:00:00 2001
 From: Niko Tyni <[email protected]>
 Date: Sat, 1 Nov 2008 15:10:16 +0200
meta/recipes-devtools/perl/perl-5.14.2/debian/cpan_definstalldirs.diff +1 -0
index 9fa9378..57e7636 100644
@@ -1,3 +1,4 @@
+Upstream-Status:Inappropriate [debian patches]
 From 4b63b9a433661cd13cfb1448dbfb90c5f53a53be Mon Sep 17 00:00:00 2001
 From: Brendan O'Dea <[email protected]>
 Date: Tue, 8 Mar 2005 19:30:38 +1100
meta/recipes-devtools/perl/perl-5.14.2/debian/cpanplus_config_path.diff +1 -0
index e3e5ec9..f33221c 100644
@@ -1,3 +1,4 @@
+Upstream-Status:Inappropriate [debian patches]
 From 9825086b15f34f365a272cc8d6caf4e2044bede6 Mon Sep 17 00:00:00 2001
 From: Niko Tyni <[email protected]>
 Date: Mon, 6 Jul 2009 22:17:53 +0300
meta/recipes-devtools/perl/perl-5.14.2/debian/cpanplus_definstalldirs.diff +1 -0
index 6d05c34..7df2860 100644
@@ -1,3 +1,4 @@
+Upstream-Status:Inappropriate [debian patches]
 From 66517b14790aa6410fd37e411dd62521e1e02b7f Mon Sep 17 00:00:00 2001
 From: Niko Tyni <[email protected]>
 Date: Mon, 6 Jul 2009 21:58:41 +0300
meta/recipes-devtools/perl/perl-5.14.2/debian/db_file_ver.diff +1 -0
index ff07ec5..8726056 100644
@@ -1,3 +1,4 @@
+Upstream-Status:Inappropriate [debian patches]
 From 0d1acf7af6da3a3f933faba8459ad9ff03fe3e5b Mon Sep 17 00:00:00 2001
 From: Brendan O'Dea <[email protected]>
 Date: Fri, 16 Dec 2005 01:32:14 +1100
meta/recipes-devtools/perl/perl-5.14.2/debian/deprecate-with-apt.diff +1 -0
index 65a132d..3a145a1 100644
@@ -1,3 +1,4 @@
+Upstream-Status:Inappropriate [debian patches]
 From c2bd2059cfbba573643c748ace4ff4db4cbf015d Mon Sep 17 00:00:00 2001
 From: Dominic Hargreaves <[email protected]>
 Date: Mon, 17 May 2010 13:23:07 +0300
meta/recipes-devtools/perl/perl-5.14.2/debian/disable-zlib-bundling.diff +1 -0
index 80c0acb..03ef76f 100644
@@ -1,3 +1,4 @@
+Upstream-Status:Inappropriate [debian patches]
 From 90c7967530102c66bbff25d89273d3f0bf189a83 Mon Sep 17 00:00:00 2001
 From: Niko Tyni <[email protected]>
 Date: Fri, 10 Apr 2009 01:17:43 +0300
meta/recipes-devtools/perl/perl-5.14.2/debian/doc_info.diff +1 -0
index a118da3..889024a 100644
@@ -1,3 +1,4 @@
+Upstream-Status:Inappropriate [debian patches]
 From 16ebe1f5232621d8894aa6c6210fdf2fc9b54a84 Mon Sep 17 00:00:00 2001
 From: Brendan O'Dea <[email protected]>
 Date: Fri, 18 Mar 2005 22:22:25 +1100
meta/recipes-devtools/perl/perl-5.14.2/debian/enc2xs_inc.diff +1 -0
index 7c33e90..9440348 100644
@@ -1,3 +1,4 @@
+Upstream-Status:Inappropriate [debian patches]
 From e9fd6e7729b9ebd9bc74b8cf295cd3a7f5aa5472 Mon Sep 17 00:00:00 2001
 From: Brendan O'Dea <[email protected]>
 Date: Tue, 8 Mar 2005 19:30:38 +1100
meta/recipes-devtools/perl/perl-5.14.2/debian/errno_ver.diff +1 -0
index 0f3bfa6..c7b0531 100644
@@ -1,3 +1,4 @@
+Upstream-Status:Inappropriate [debian patches]
 From 973bed42db538804179f39d66dab37c82c6ade24 Mon Sep 17 00:00:00 2001
 From: Brendan O'Dea <[email protected]>
 Date: Fri, 16 Dec 2005 01:32:14 +1100
meta/recipes-devtools/perl/perl-5.14.2/debian/extutils_set_libperl_path.diff +1 -0
index 4c2da32..d704c00 100644
@@ -1,3 +1,4 @@
+Upstream-Status:Inappropriate [debian patches]
 From 334ac01a8306485ed901f4fb45d79f39a944fe77 Mon Sep 17 00:00:00 2001
 From: Brendan O'Dea <[email protected]>
 Date: Tue, 8 Mar 2005 19:30:38 +1100
meta/recipes-devtools/perl/perl-5.14.2/debian/fakeroot.diff +1 -0
index bd90af9..79e7fcf 100644
@@ -1,3 +1,4 @@
+Upstream-Status:Inappropriate [debian patches]
 From a46a7107fb045ffa6047488b8002fec97b621a11 Mon Sep 17 00:00:00 2001
 From: Brendan O'Dea <[email protected]>
 Date: Fri, 18 Mar 2005 22:22:25 +1100
meta/recipes-devtools/perl/perl-5.14.2/debian/find_html2text.diff +1 -0
index 16de7ad..29dc576 100644
@@ -1,3 +1,4 @@
+Upstream-Status:Inappropriate [debian patches]
 From ca66b95be369b47a6d372c3653be57cd737f7f21 Mon Sep 17 00:00:00 2001
 From: Andreas Marschke <[email protected]>
 Date: Sat, 17 Sep 2011 11:38:42 +0100
meta/recipes-devtools/perl/perl-5.14.2/debian/fixes/document_makemaker_ccflags.diff +1 -0
index 3bda8f7..3f2c3dc 100644
@@ -1,3 +1,4 @@
+Upstream-Status:Inappropriate [debian patches]
 From f0e3a51bd7286788e410510af86a6c07edac4445 Mon Sep 17 00:00:00 2001
 From: Niko Tyni <[email protected]>
 Date: Mon, 30 May 2011 22:54:24 +0300
meta/recipes-devtools/perl/perl-5.14.2/debian/fixes/extutils-cbuilder-cflags.diff +1 -0
index cd86a76..f9a3c6b 100644
@@ -1,3 +1,4 @@
+Upstream-Status:Inappropriate [debian patches]
 From 0c91624f1f9ec46a6f13cad3031b706213233479 Mon Sep 17 00:00:00 2001
 From: Niko Tyni <[email protected]>
 Date: Thu, 28 Apr 2011 09:18:54 +0300
meta/recipes-devtools/perl/perl-5.14.2/debian/fixes/h2ph-multiarch.diff +1 -0
index b18b464..3b6b4a0 100644
@@ -1,3 +1,4 @@
+Upstream-Status:Inappropriate [debian patches]
 From 37969e249dfc593ebabfcb682893b6c69dc6b313 Mon Sep 17 00:00:00 2001
 From: Niko Tyni <[email protected]>
 Date: Wed, 18 May 2011 21:44:06 -0700
meta/recipes-devtools/perl/perl-5.14.2/debian/fixes/hurd-ccflags.diff +1 -0
index 901f98d..6822720 100644
@@ -1,3 +1,4 @@
+Upstream-Status:Inappropriate [debian patches]
 From f66e8575cb0ca11171f43efe0f9e3c6e790b75bc Mon Sep 17 00:00:00 2001
 From: Samuel Thibault <[email protected]>
 Date: Wed, 4 Aug 2010 13:34:05 +0300
meta/recipes-devtools/perl/perl-5.14.2/debian/fixes/hurd-hints.diff +1 -0
index 1ba9cbd..6c55e71 100644
@@ -1,3 +1,4 @@
+Upstream-Status:Inappropriate [debian patches]
 From d6fd7595fcd04b332e7449f59ea298639f10a183 Mon Sep 17 00:00:00 2001
 From: Pino Toscano <[email protected]>
 Date: Wed, 10 Aug 2011 08:11:33 +0300
meta/recipes-devtools/perl/perl-5.14.2/debian/fixes/index-tainting.diff +1 -0
index 204e999..ee00ca3 100644
@@ -1,3 +1,4 @@
+Upstream-Status:Inappropriate [debian patches]
 From e25298a339dd6679f1b080f0125ac1b237b87950 Mon Sep 17 00:00:00 2001
 From: David Mitchell <[email protected]>
 Date: Tue, 28 Jun 2011 17:04:40 +0100
meta/recipes-devtools/perl/perl-5.14.2/debian/fixes/module-build-home-directory.diff +1 -0
index 1c9009b..998a6a3 100644
@@ -1,3 +1,4 @@
+Upstream-Status:Inappropriate [debian patches]
 From 9266292f705f2a3b6e5b97fa50e5f2be31371d5c Mon Sep 17 00:00:00 2001
 From: Dominic Hargreaves <[email protected]>
 Date: Mon, 2 May 2011 10:35:04 +0100
meta/recipes-devtools/perl/perl-5.14.2/debian/fixes/net_smtp_docs.diff +1 -0
index 549fc10..f68c352 100644
@@ -1,3 +1,4 @@
+Upstream-Status:Inappropriate [debian patches]
 From ab32eba7fcc45d864c22e8f4ee02e0a6712070e0 Mon Sep 17 00:00:00 2001
 From: Brendan O'Dea <[email protected]>
 Date: Thu, 20 Sep 2007 19:47:14 +1000
meta/recipes-devtools/perl/perl-5.14.2/debian/fixes/pod_fixes.diff +1 -0
index eb0eb0b..58e770b 100644
@@ -1,3 +1,4 @@
+Upstream-Status:Inappropriate [debian patches]
 From c6b1fdd18dab0236458502564e54c180bb0ce341 Mon Sep 17 00:00:00 2001
 From: Keith Thompson <[email protected]>
 Date: Fri, 29 Jul 2011 17:17:00 -0700
meta/recipes-devtools/perl/perl-5.14.2/debian/fixes/respect_umask.diff +1 -0
index a84c9f9..aa9307f 100644
@@ -1,3 +1,4 @@
+Upstream-Status:Inappropriate [debian patches]
 From 0d1ab4f799eb14d5488fcc959f4a6bdec548b370 Mon Sep 17 00:00:00 2001
 From: Brendan O'Dea <[email protected]>
 Date: Tue, 8 Mar 2005 19:30:38 +1100
meta/recipes-devtools/perl/perl-5.14.2/debian/fixes/sys-syslog-socket-timeout-kfreebsd.patch +1 -0
index e29e9b0..632d426 100644
@@ -1,3 +1,4 @@
+Upstream-Status:Inappropriate [debian patches]
 From 9ba88d73444c22788b7c2a212e15dbfe3da2a1af Mon Sep 17 00:00:00 2001
 From: Niko Tyni <[email protected]>
 Date: Wed, 3 Aug 2011 22:36:24 +0300
meta/recipes-devtools/perl/perl-5.14.2/debian/instmodsh_doc.diff +1 -0
index ab0133d..ae13178 100644
@@ -1,3 +1,4 @@
+Upstream-Status:Inappropriate [debian patches]
 From ab89a31d1f46388a61953349c3546e4082cd38de Mon Sep 17 00:00:00 2001
 From: Brendan O'Dea <[email protected]>
 Date: Tue, 8 Mar 2005 19:30:38 +1100
meta/recipes-devtools/perl/perl-5.14.2/debian/ld_run_path.diff +1 -0
index d38b04b..929328b 100644
@@ -1,3 +1,4 @@
+Upstream-Status:Inappropriate [debian patches]
 From 704f6017119ce0301a9105944512120a38a43a02 Mon Sep 17 00:00:00 2001
 From: Brendan O'Dea <[email protected]>
 Date: Fri, 18 Mar 2005 22:22:25 +1100
meta/recipes-devtools/perl/perl-5.14.2/debian/libnet_config_path.diff +1 -0
index 6604d35..454cb9e 100644
@@ -1,3 +1,4 @@
+Upstream-Status:Inappropriate [debian patches]
 From 7465b6d008187580eabe655b9c8e75351d3d24b4 Mon Sep 17 00:00:00 2001
 From: Brendan O'Dea <[email protected]>
 Date: Tue, 8 Mar 2005 19:30:38 +1100
meta/recipes-devtools/perl/perl-5.14.2/debian/libperl_embed_doc.diff +1 -0
index cc3e050..d1bf8bd 100644
@@ -1,3 +1,4 @@
+Upstream-Status:Inappropriate [debian patches]
 From d70e88badfcc6edd05e884597f19fbbdcf2cf6a7 Mon Sep 17 00:00:00 2001
 From: Brendan O'Dea <[email protected]>
 Date: Tue, 8 Mar 2005 19:30:38 +1100
meta/recipes-devtools/perl/perl-5.14.2/debian/m68k_thread_stress.diff +1 -0
index f1dfe36..1c3b6b5 100644
@@ -1,3 +1,4 @@
+Upstream-Status:Inappropriate [debian patches]
 From 55a718425dc4612ac01850ef786f75f072b20b9e Mon Sep 17 00:00:00 2001
 From: Niko Tyni <[email protected]>
 Date: Mon, 8 Sep 2008 20:48:14 +0300
meta/recipes-devtools/perl/perl-5.14.2/debian/mod_paths.diff +1 -0
index 2cc0946..ceac541 100644
@@ -1,3 +1,4 @@
+Upstream-Status:Inappropriate [debian patches]
 From 11633e598640b02e19329f323623af254fbac451 Mon Sep 17 00:00:00 2001
 From: Brendan O'Dea <[email protected]>
 Date: Fri, 18 Mar 2005 22:22:25 +1100
meta/recipes-devtools/perl/perl-5.14.2/debian/module_build_man_extensions.diff +1 -0
index b11433f..64401d9 100644
@@ -1,3 +1,4 @@
+Upstream-Status:Inappropriate [debian patches]
 From fbb5f07872d45bac76b5c3c83b50a19aa5da10b0 Mon Sep 17 00:00:00 2001
 From: Niko Tyni <[email protected]>
 Date: Thu, 8 May 2008 14:32:33 +0300
meta/recipes-devtools/perl/perl-5.14.2/debian/no_packlist_perllocal.diff +1 -0
index 3324c1e..00633e3 100644
@@ -1,3 +1,4 @@
+Upstream-Status:Inappropriate [debian patches]
 From 44c7521619dd0e637920393184affcb26a27d5b7 Mon Sep 17 00:00:00 2001
 From: Brendan O'Dea <[email protected]>
 Date: Tue, 8 Mar 2005 19:30:38 +1100
meta/recipes-devtools/perl/perl-5.14.2/debian/patchlevel.diff +1 -0
index 0a8a467..9c25eb7 100644
@@ -1,3 +1,4 @@
+Upstream-Status:Inappropriate [debian patches]
 From cf928101697efa4a46ada500c2f449caeb854fd4 Mon Sep 17 00:00:00 2001
 From: Niko Tyni <[email protected]>
 Date: Sun, 15 May 2011 19:35:58 +0300
meta/recipes-devtools/perl/perl-5.14.2/debian/perlivp.diff +1 -0
index 98b1b50..21711e8 100644
@@ -1,3 +1,4 @@
+Upstream-Status:Inappropriate [debian patches]
 From 4c7e04f75c9513451d1622e5a6dd58c2c8377d81 Mon Sep 17 00:00:00 2001
 From: Niko Tyni <[email protected]>
 Date: Fri, 9 Jan 2009 18:54:47 +0200
meta/recipes-devtools/perl/perl-5.14.2/debian/prefix_changes.diff +1 -0
index a1e17ce..5a1ad99 100644
@@ -1,3 +1,4 @@
+Upstream-Status:Inappropriate [debian patches]
 From 148e2717682ce8c65475ffdeea84b3cdd1ab1649 Mon Sep 17 00:00:00 2001
 From: Brendan O'Dea <[email protected]>
 Date: Tue, 8 Mar 2005 19:30:38 +1100
meta/recipes-devtools/perl/perl-5.14.2/debian/prune_libs.diff +1 -0
index bb05a94..e3c320e 100644
@@ -1,3 +1,4 @@
+Upstream-Status:Inappropriate [debian patches]
 From 063566907896ff32bea27897fa73cebbbd7bacce Mon Sep 17 00:00:00 2001
 From: Brendan O'Dea <[email protected]>
 Date: Fri, 18 Mar 2005 22:22:25 +1100
meta/recipes-devtools/perl/perl-5.14.2/debian/skip-kfreebsd-crash.diff +1 -0
index 7992129..cdade88 100644
@@ -1,3 +1,4 @@
+Upstream-Status:Inappropriate [debian patches]
 From ff2815399ad94915da2e63cb3c4bbd2d02dac4b2 Mon Sep 17 00:00:00 2001
 From: Niko Tyni <[email protected]>
 Date: Fri, 5 Aug 2011 10:50:18 +0300
meta/recipes-devtools/perl/perl-5.14.2/debian/skip-upstream-git-tests.diff +1 -0
index a157bc7..2c30536 100644
@@ -1,3 +1,4 @@
+Upstream-Status:Inappropriate [debian patches]
 From 2be2eed9148c38d3e982d3371f379ce77021aeb5 Mon Sep 17 00:00:00 2001
 From: Niko Tyni <[email protected]>
 Date: Fri, 22 Apr 2011 11:15:32 +0300
meta/recipes-devtools/perl/perl-5.14.2/debian/squelch-locale-warnings.diff +1 -0
index 71660b0..f0a6924 100644
@@ -1,3 +1,4 @@
+Upstream-Status:Inappropriate [debian patches]
 From 718e9cbd59f0739fc9104af111e42fff66f927a7 Mon Sep 17 00:00:00 2001
 From: Niko Tyni <[email protected]>
 Date: Sun, 3 Oct 2010 21:36:17 +0300
meta/recipes-devtools/perl/perl-5.14.2/debian/writable_site_dirs.diff +1 -0
index a4fc32a..a4a9adf 100644
@@ -1,3 +1,4 @@
+Upstream-Status:Inappropriate [debian patches]
 From 492e0d6b4e3e0d786fb88b9058d581f6466c4a3e Mon Sep 17 00:00:00 2001
 From: Brendan O'Dea <[email protected]>
 Date: Tue, 8 Mar 2005 19:30:38 +1100
Signature · 1 line
1.7.6.4
author
#11 lore raw

PATCH 10/14 gcc: mark upstream status for all patches

In reply to [email protected]

From: Nitin A Kamble <[email protected]>

Some patches were missing Upstream-Status informantion, this commit adds that in those patches.

Signed-off-by Nitin A Kamble <[email protected]>
---
 .../gcc/gcc-4.6/gcc-arm-set-cost.patch             |    1 +
 meta/recipes-devtools/gcc/gcc-4.6/pr32219.patch    |    1 +
 meta/recipes-devtools/gcc/gcc-4.6/pr46934.patch    |    1 +
 meta/recipes-devtools/gcc/gcc-4.6/pr47551.patch    |    1 +
 4 files changed, 4 insertions(+), 0 deletions(-)
meta/recipes-devtools/gcc/gcc-4.6/gcc-arm-set-cost.patch +1 -0
index 04dabaf..4419a20 100644
@@ -1,3 +1,4 @@
+Upstream-Status:Backport
 2011-08-18  Richard Sandiford  <[email protected]>
 
  	gcc/
meta/recipes-devtools/gcc/gcc-4.6/pr32219.patch +1 -0
index e310080..c0e3594 100644
@@ -1,3 +1,4 @@
+Upstream-Status:Backport
 Hi,
 
 As suggested by richi.
meta/recipes-devtools/gcc/gcc-4.6/pr46934.patch +1 -0
index afd3eef..60b7012 100644
@@ -1,3 +1,4 @@
+Upstream-Status:Backport
 2011-09-19  chengbin  <[email protected]>
 
 	Backport r174035 from mainline
meta/recipes-devtools/gcc/gcc-4.6/pr47551.patch +1 -0
index 5271ffa..2c6bcda 100644
@@ -1,3 +1,4 @@
+Upstream-Status:Backport
 2011-02-02  Richard Sandiford  <[email protected]>
 
 	gcc/
Signature · 1 line
1.7.6.4
author
#12 lore raw

PATCH 11/14 avahi-ui: fix build with automake-1.11.2

In reply to [email protected]

From: Nitin A Kamble <[email protected]>

With automake 1.11.2 /usr/lib/<pkgname> files are moved to /usr/share/<pkgname>
Fix the rmdir in do_install which expect /usr/lib/avahi to exist.

Signed-off-by Nitin A Kamble <[email protected]>
---
 meta/recipes-connectivity/avahi/avahi-ui_0.6.30.bb |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
meta/recipes-connectivity/avahi/avahi-ui_0.6.30.bb +1 -2
index c903087..bcc1f41 100644
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2d5025d4aa3495befef8f17206a5b0a1 \
 
 require avahi.inc
 
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
 
 DEPENDS += "avahi gtk+ libglade"
 

@@ -50,7 +50,6 @@ do_install_append () {
 	rm ${D}${libdir}/libavahi-g*
 	rm ${D}${libdir}/pkgconfig/avahi-c*
 	rm ${D}${libdir}/pkgconfig/avahi-g*
-	rmdir ${D}${libdir}/avahi
 	rm ${D}${sbindir} -rf
 	rm ${D}${datadir}/avahi/a*
 	rm ${D}${datadir}/avahi/s*
Signature · 1 line
1.7.6.4
author
#13 lore raw

PATCH 12/14 vte: upgrade from 0.24.3 to 0.28.2

In reply to [email protected]

From: Nitin A Kamble <[email protected]>

Added gobject-introspection-native to depends as the configure needs an m4 macro file generated by it to avoid this error:

src/Makefile.am:168: HAVE_INTROSPECTION does not appear in AM_CONDITIONAL

This upgrade avoids configure issues with automake version 1.11.2 seen on the earlier version.
| src/Makefile.am:155: pkglibdir' is not a legitimate directory for PROGRAMS'
| src/Makefile.am:156: pkglibdir' is not a legitimate directory for SCRIPTS'
| src/Makefile.am:178: variable `interpret_SOURCES' is defined but no program or
| src/Makefile.am:178: library has `interpret' as canonical name (possible typo)
| src/Makefile.am:229: variable `slowcat_SOURCES' is defined but no program or
| src/Makefile.am:229: library has `slowcat' as canonical name (possible typo)
| src/Makefile.am:203: variable `interpret_LDADD' is defined but no program or
| src/Makefile.am:203: library has `interpret' as canonical name (possible typo)
| autoreconf: automake failed with exit status: 1
| ERROR: autoreconf execution failed.
NOTE: package vte-0.24.3-r0: task do_configure: Failed

Did not upgrade to the latest version 0.31.0.
0.28.2 is the last version supporting gtp+ 2. Next versions have dropped support for gtk+ 2, and they require gtk+ 3. It would be more appropriate to move to next version after gtk+ 3 recipe is available.

Signed-off-by Nitin A Kamble <[email protected]>
---
 meta/recipes-support/vte/vte.inc       |    2 +-
 meta/recipes-support/vte/vte_0.24.3.bb |    8 --------
 meta/recipes-support/vte/vte_0.28.2.bb |   10 ++++++++++
 3 files changed, 11 insertions(+), 9 deletions(-)
 delete mode 100644 meta/recipes-support/vte/vte_0.24.3.bb
 create mode 100644 meta/recipes-support/vte/vte_0.28.2.bb
meta/recipes-support/vte/vte.inc +1 -1
index 6138f8c..239516d 100644
@@ -11,4 +11,4 @@ EXTRA_OECONF = "--disable-gtk-doc --disable-python"
 PACKAGES =+ "libvte vte-termcap"
 FILES_libvte = "${libdir}/*.so.* ${libexecdir}/gnome-pty-helper"
 FILES_vte-dbg =+ ${libexecdir}/.debug"
-FILES_vte-termcap = "${datadir}/vte/termcap"
+FILES_vte-termcap = "${datadir}/vte/termcap-0.0"
meta/recipes-support/vte/vte_0.24.3.bb deleted +0 -8
deleted file mode 100644
index c06dd53..0000000
@@ -1,8 +0,0 @@
-require vte.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
-
-PR = "r0"
-
-SRC_URI[archive.md5sum] = "3eba555eab7ccbbe5ca056bb203a14ab"
-SRC_URI[archive.sha256sum] = "fe7d01178976b17ca809e41d0e6dbbcb28e2af5e2f5aa857f9df65affac17d01"
meta/recipes-support/vte/vte_0.28.2.bb new file +10 -0
new file mode 100644
index 0000000..d4e32f7
@@ -0,0 +1,10 @@
+require vte.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
+
+PR = "r0"
+
+SRC_URI[archive.md5sum] = "f07a4bf943194f94b7f142db8f7f36dc"
+SRC_URI[archive.sha256sum] = "8d04e202b617373dfb47689e5e628febe2c58840b34cccc4af4feb88c48df903"
+
+DEPENDS += "gobject-introspection-native"
Signature · 1 line
1.7.6.4
author
#14 lore raw

PATCH 13/14 systemtap: fix configure with automake 1.11.2

In reply to [email protected]

From: Nitin A Kamble <[email protected]>

automake version 1.11.2 has made use of dir variables more strict. The pkglibexec var can not have SCRIPTS suffix. Using pkgdata instead.

Fixes this error:
| Makefile.am:25: pkglibexecdir' is not a legitimate directory for SCRIPTS'
| autoreconf: automake failed with exit status: 1
| ERROR: autoreconf execution failed.
NOTE: package systemtap-1.6+git1+820f2d22fc47fad6e09ba886efb9b91e1247cb39-r0: task
do_configure: Failed

Signed-off-by Nitin A Kamble <[email protected]>
---
 .../systemtap/fix_for_automake_1.11.2.patch        |   46 ++++++++++++++++++++
 meta/recipes-kernel/systemtap/systemtap_git.bb     |    3 +-
 2 files changed, 48 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-kernel/systemtap/systemtap/fix_for_automake_1.11.2.patch
meta/recipes-kernel/systemtap/systemtap/fix_for_automake_1.11.2.patch new file +46 -0
new file mode 100644
index 0000000..99e72b2
@@ -0,0 +1,46 @@
+Upstream-Status: Pending
+
+automake version 1.11.2 has made use of dir variables more strict.
+The pkglibexec var can not have SCRIPTS suffix. Using pkgdata
+instead.
+
+Fixes this error:
+| Makefile.am:25: `pkglibexecdir' is not a legitimate directory for `SCRIPTS'
+| autoreconf: automake failed with exit status: 1
+| ERROR: autoreconf execution failed.
+NOTE: package systemtap-1.6+git1+820f2d22fc47fad6e09ba886efb9b91e1247cb39-r0: task do_configure: Failed
+
+Signed-Off-By: Nitin A Kamble <[email protected]>
+2011/12/29
+
+Index: git/Makefile.am
+===================================================================
+--- git.orig/Makefile.am
++++ git/Makefile.am
+@@ -22,7 +22,7 @@ dtrace.1 stap-merge.1\
+ stappaths.7
+ 
+ bin_SCRIPTS = stap-report
+-pkglibexec_SCRIPTS = stap-env
++pkgdata_SCRIPTS = stap-env
+ oldinclude_HEADERS = includes/sys/sdt.h includes/sys/sdt-config.h
+ 
+ bin_PROGRAMS =
+@@ -41,7 +41,7 @@ if BUILD_SERVER
+ man_MANS += stap-server.8
+ pkglibexec_PROGRAMS += stap-serverd stap-gen-cert
+ bin_SCRIPTS += stap-server
+-pkglibexec_SCRIPTS += stap-start-server stap-stop-server
++pkgdata_SCRIPTS += stap-start-server stap-stop-server
+ endif
+ endif
+ 
+@@ -127,7 +127,7 @@ install-scripts: install-binSCRIPTS inst
+ 	for f in $(bin_SCRIPTS); do \
+ 	   sed -i -e "s,\$${PKGLIBEXECDIR},$(pkglibexecdir)/," $(DESTDIR)$(bindir)/$$f; \
+ 	done
+-	for f in $(pkglibexec_SCRIPTS); do \
++	for f in $(pkgdata_SCRIPTS); do \
+ 	   sed -i -e "/INSTALL-HOOK/d;s,sysconfdir=.*,sysconfdir=$(sysconfdir),;s,pkglibexecdir=.*,pkglibexecdir=$(pkglibexecdir)/,;s,localstatedir=.*,localstatedir=$(localstatedir),;s,\$${PKGLIBEXECDIR},$(pkglibexecdir)/," $(DESTDIR)$(pkglibexecdir)/$$f; \
+ 	done
+ endif
meta/recipes-kernel/systemtap/systemtap_git.bb +2 -1
index 732d9a7..1c64be6 100644
@@ -5,10 +5,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 DEPENDS = "elfutils sqlite3"
 
 SRCREV = "820f2d22fc47fad6e09ba886efb9b91e1247cb39"
-PR = "r0"
+PR = "r1"
 PV = "1.6+git${SRCPV}"
 
 SRC_URI = "git://sources.redhat.com/git/systemtap.git;protocol=git \
+           file://fix_for_automake_1.11.2.patch \
           "
 
 EXTRA_OECONF += "--with-libelf=${STAGING_DIR_TARGET} --without-rpm \
Signature · 1 line
1.7.6.4
author
#15 lore raw

PATCH 14/14 automake: upgrade from 1.11.1 to 1.11.2

In reply to [email protected]

From: Nitin A Kamble <[email protected]>

Signed-off-by Nitin A Kamble <[email protected]>
---
 meta/recipes-devtools/automake/automake.inc        |    1 -
 .../{automake_1.11.1.bb => automake_1.11.2.bb}     |    5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-devtools/automake/{automake_1.11.1.bb => automake_1.11.2.bb} (88%)
meta/recipes-devtools/automake/automake.inc +0 -1
index 25b0c0e..c259673 100644
@@ -4,7 +4,6 @@ Standards. Automake requires the use of Autoconf."
 LICENSE = "GPLv2"
 HOMEPAGE = "http://www.gnu.org/software/automake/"
 SECTION = "devel"
-PR = "r5"
 
 SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 "
meta/recipes-devtools/automake/automake_1.11.2.bb renamed from meta/recipes-devtools/automake/automake_1.11.1.bb +3 -2
similarity index 88%
rename from meta/recipes-devtools/automake/automake_1.11.1.bb
rename to meta/recipes-devtools/automake/automake_1.11.2.bb
index ff8353f..18436d2 100644
@@ -37,8 +37,9 @@ SRC_URI += "${PATHFIXPATCH} \
 	    file://prefer-cpio-over-pax-for-ustar-archives.patch \
 	    file://python-libdir.patch"
 
-SRC_URI[md5sum] = "c2972c4d9b3e29c03d5f2af86249876f"
-SRC_URI[sha256sum] = "5b159d3c0e0a1f87de71b68bcb9f1a1c49e9e71749c9b723f17e2e1e0295c7ae"
+PR=r0
+SRC_URI[md5sum] = "18194e804d415767bae8f703c963d456"
+SRC_URI[sha256sum] = "4f46d1f9380c8a3506280750f630e9fc915cb1a435b724be56b499d016368718"
 
 do_install () {
 	oe_runmake 'DESTDIR=${D}' install
Signature · 1 line
1.7.6.4
#16 lore raw

Re: [PATCH 14/14] automake: upgrade from 1.11.1 to 1.11.2

Quoted 29 lines · On Thu, Dec 29, 2011 at 04:30:59PM -0800, [email protected] wrote:

From: Nitin A Kamble <[email protected]>

Signed-off-by Nitin A Kamble <[email protected]>
---
 meta/recipes-devtools/automake/automake.inc        |    1 -
 .../{automake_1.11.1.bb => automake_1.11.2.bb}     |    5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-devtools/automake/{automake_1.11.1.bb => automake_1.11.2.bb} (88%)
meta/recipes-devtools/automake/automake.inc +0 -1
index 25b0c0e..c259673 100644
@@ -4,7 +4,6 @@ Standards. Automake requires the use of Autoconf."
 LICENSE = "GPLv2"
 HOMEPAGE = "http://www.gnu.org/software/automake/"
 SECTION = "devel"
-PR = "r5"
 
 SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 "
meta/recipes-devtools/automake/automake_1.11.2.bb renamed from meta/recipes-devtools/automake/automake_1.11.1.bb +0 -0
similarity index 88%
rename from meta/recipes-devtools/automake/automake_1.11.1.bb
rename to meta/recipes-devtools/automake/automake_1.11.2.bb
index ff8353f..18436d2 100644

meta/recipes-devtools/automake/automake_1.11.2.bb SRC_URI += "${PATHFIXPATCH} \ · line 40

Quoted 6 lines
meta/recipes-devtools/automake/automake_1.11.2.bb renamed from meta/recipes-devtools/automake/automake_1.11.1.bb +1 -2
@@ -37,8 +37,9 @@ SRC_URI += "${PATHFIXPATCH} \
 	    file://prefer-cpio-over-pax-for-ustar-archives.patch \
 	    file://python-libdir.patch"
 
-SRC_URI[md5sum] = "c2972c4d9b3e29c03d5f2af86249876f"
-SRC_URI[sha256sum] = "5b159d3c0e0a1f87de71b68bcb9f1a1c49e9e71749c9b723f17e2e1e0295c7ae"
+PR=r0

Just style issue but please add spaces and quotes.

Quoted 13 lines
meta/recipes-devtools/automake/automake_1.11.2.bb renamed from meta/recipes-devtools/automake/automake_1.11.1.bb +2 -0
+SRC_URI[md5sum] = "18194e804d415767bae8f703c963d456"
+SRC_URI[sha256sum] = "4f46d1f9380c8a3506280750f630e9fc915cb1a435b724be56b499d016368718"
 
 do_install () {
 	oe_runmake 'DESTDIR=${D}' install
Signature · 7 lines
1.7.6.4


_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
author
#17 lore raw

Re: [PATCH 14/14] automake: upgrade from 1.11.1 to 1.11.2

Quoted 48 lines

-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Martin Jansa
Sent: Thursday, December 29, 2011 10:36 PM
To: Patches and discussions about the oe-core layer
Subject: Re: [OE-core] [PATCH 14/14] automake: upgrade from 1.11.1 to 1.11.2

Quoted 35 lines · On Thu, Dec 29, 2011 at 04:30:59PM -0800, [email protected] wrote:

From: Nitin A Kamble <[email protected]>

Signed-off-by Nitin A Kamble <[email protected]>
---
 meta/recipes-devtools/automake/automake.inc        |    1 -
 .../{automake_1.11.1.bb => automake_1.11.2.bb}     |    5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)  rename

meta/recipes-devtools/automake/{automake_1.11.1.bb => automake_1.11.2.bb} (88%)

meta/recipes-devtools/automake/automake.inc +0 -1
index 25b0c0e..c259673 100644
@@ -4,7 +4,6 @@ Standards. Automake requires the use of Autoconf."
 LICENSE = "GPLv2"
 HOMEPAGE = "http://www.gnu.org/software/automake/"
 SECTION = "devel"
-PR = "r5"
 
 SRC_URI = "${GNU_MIRROR}/automake/automake-${PV}.tar.bz2 "
meta/recipes-devtools/automake/automake_1.11.2.bb renamed from meta/recipes-devtools/automake/automake_1.11.1.bb +0 -0
similarity index 88%
rename from meta/recipes-devtools/automake/automake_1.11.1.bb
rename to meta/recipes-devtools/automake/automake_1.11.2.bb
index ff8353f..18436d2 100644
@@ -37,8 +37,9 @@ SRC_URI += "${PATHFIXPATCH} \
 	    file://prefer-cpio-over-pax-for-ustar-archives.patch \
 	    file://python-libdir.patch"
Quoted 6 lines

meta/recipes-devtools/automake/automake_1.11.2.bb SRC_URI += "${PATHFIXPATCH} \ · line 41

Quoted 2 lines
meta/recipes-devtools/automake/automake_1.11.2.bb renamed from meta/recipes-devtools/automake/automake_1.11.1.bb +0 -2
-SRC_URI[md5sum] = "c2972c4d9b3e29c03d5f2af86249876f"
-SRC_URI[sha256sum] =

"5b159d3c0e0a1f87de71b68bcb9f1a1c49e9e71749c9b723f17e2e1e0295c7ae"

meta/recipes-devtools/automake/automake_1.11.2.bb SRC_URI += "${PATHFIXPATCH} \ · line 40

Quoted 1 line
meta/recipes-devtools/automake/automake_1.11.2.bb renamed from meta/recipes-devtools/automake/automake_1.11.1.bb +1 -0
+PR=r0

Just style issue but please add spaces and quotes.

Thanks for catching this. I have fixed it on the contrib branch: nitin/upgrades+fixes

Thanks,
Nitin

Quoted 18 lines

meta/recipes-devtools/automake/automake_1.11.2.bb SRC_URI += "${PATHFIXPATCH} \ · line 42

Quoted 3 lines
meta/recipes-devtools/automake/automake_1.11.2.bb renamed from meta/recipes-devtools/automake/automake_1.11.1.bb +2 -0
+SRC_URI[md5sum] = "18194e804d415767bae8f703c963d456"
+SRC_URI[sha256sum] =

"4f46d1f9380c8a3506280750f630e9fc915cb1a435b724be56b499d016368718"

Quoted 11 lines
meta/recipes-devtools/automake/automake_1.11.2.bb renamed from meta/recipes-devtools/automake/automake_1.11.1.bb +0 -1
 do_install () {
 	oe_runmake 'DESTDIR=${D}' install
--

1.7.6.4

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

--
Martin 'JaMa' Jansa jabber: [email protected]