Skip to contentSkip to conversation

Packages Upgrade

PATCH New Robert Yang 1 participant 8 messages Jul 25, 2016

lore
Share & tools
lore
#0 lore raw

v2 cover Packages Upgrade

* V2
- Use SECURITY_NO_PIE_CFLAGS for SECURITY_CFLAGS
- Drop e2fsprogs upgrading atm since it can't be built when musl + qemux86 + --enable-hardening.

// Robert

The following changes since commit 0a2df616a5c3316704742f1dcf37b450920e0280:

boost: fix CVE-2012-2677 (2016-07-21 07:45:01 +0100)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib rbt/pu
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/pu

Robert Yang (7):
git: 2.8.4 -> 2.9.2
guile: 2.0.11 -> 2.0.12
gnu-efi: 3.0.3 -> 3.0.4
slang: 2.2.4 -> 2.3.0
gettext: 0.19.6 -> 0.19.8.1
gettext-minimal-native: 0.19.4 -> 0.19.8.1
ccache: 3.2.4 -> 3.2.5

 meta/conf/distro/include/security_flags.inc        |   1 +
 .../aarch64-initplat.c-fix-const-qualifier.patch   |  35 ++++
 .../gnu-efi-Make-setjmp.S-portable-to-ARM.patch    |  50 -----
 .../gnu-efi/{gnu-efi_3.0.3.bb => gnu-efi_3.0.4.bb} |  27 ++-
 .../add-with-bisonlocaledir.patch                  |   0
 .../parallel.patch                                 |   0
 .../gettext/gettext-minimal-0.19.4/aclocal.tgz     | Bin 39744 -> 0 bytes
 ...-PATCH-Disable-the-test-to-convert-euc-jp.patch |   0
 .../COPYING                                        |   2 +-
 .../Makefile.in.in                                 |  44 +++--
 .../gettext/gettext-minimal-0.19.8.1/aclocal.tgz   | Bin 0 -> 40014 bytes
 .../config.rpath                                   |   2 +-
 .../remove-potcdate.sin                            |   0
 ....19.4.bb => gettext-minimal-native_0.19.8.1.bb} |   3 +-
 .../{gettext_0.19.6.bb => gettext_0.19.8.1.bb}     |   9 +-
 meta/recipes-devtools/ccache/ccache_3.2.4.bb       |  10 -
 meta/recipes-devtools/ccache/ccache_3.2.5.bb       |  11 ++
 ...te-man-page-in-the-make-install-from-git-.patch |  33 ++++
 meta/recipes-devtools/git/git_2.9.2.bb             |  11 ++
 ...guile-Check-for-strtol_l-during-configure.patch |  56 ------
 ...002-Recognize-nios2-as-compilation-target.patch |  20 +-
 ...guile-VM-ASM_MUL-for-ARM-Add-earlyclobber.patch |  43 ----
 .../guile/files/remove_strcase_l_funcs.patch       |  38 ----
 .../guile/{guile_2.0.11.bb => guile_2.0.12.bb}     |  11 +-
 ...change-char-type-to-signed-char-in-macros.patch | 218 ---------------------
 .../slang/slang/fix-check-pcre.patch               |  30 +--
 meta/recipes-extended/slang/slang/rpathfix.patch   |  18 +-
 .../slang-fix-the-iconv-existence-checking.patch   |  31 +--
 .../sprintf-bug-concerning-8-bit-characters.patch  |  42 ----
 .../slang/{slang_2.2.4.bb => slang_2.3.0.bb}       |   9 +-
 30 files changed, 216 insertions(+), 538 deletions(-)
 create mode 100644 meta/recipes-bsp/gnu-efi/gnu-efi/aarch64-initplat.c-fix-const-qualifier.patch
 delete mode 100644 meta/recipes-bsp/gnu-efi/gnu-efi/gnu-efi-Make-setjmp.S-portable-to-ARM.patch
 rename meta/recipes-bsp/gnu-efi/{gnu-efi_3.0.3.bb => gnu-efi_3.0.4.bb} (59%)
 rename meta/recipes-core/gettext/{gettext-0.19.6 => gettext-0.19.8.1}/add-with-bisonlocaledir.patch (100%)
 rename meta/recipes-core/gettext/{gettext-0.19.6 => gettext-0.19.8.1}/parallel.patch (100%)
 delete mode 100644 meta/recipes-core/gettext/gettext-minimal-0.19.4/aclocal.tgz
 rename meta/recipes-core/gettext/{gettext-minimal-0.19.4 => gettext-minimal-0.19.8.1}/0001-PATCH-Disable-the-test-to-convert-euc-jp.patch (100%)
 rename meta/recipes-core/gettext/{gettext-minimal-0.19.4 => gettext-minimal-0.19.8.1}/COPYING (76%)
 rename meta/recipes-core/gettext/{gettext-minimal-0.19.4 => gettext-minimal-0.19.8.1}/Makefile.in.in (91%)
 create mode 100644 meta/recipes-core/gettext/gettext-minimal-0.19.8.1/aclocal.tgz
 rename meta/recipes-core/gettext/{gettext-minimal-0.19.4 => gettext-minimal-0.19.8.1}/config.rpath (99%)
 rename meta/recipes-core/gettext/{gettext-minimal-0.19.4 => gettext-minimal-0.19.8.1}/remove-potcdate.sin (100%)
 rename meta/recipes-core/gettext/{gettext-minimal-native_0.19.4.bb => gettext-minimal-native_0.19.8.1.bb} (93%)
 rename meta/recipes-core/gettext/{gettext_0.19.6.bb => gettext_0.19.8.1.bb} (93%)
 delete mode 100644 meta/recipes-devtools/ccache/ccache_3.2.4.bb
 create mode 100644 meta/recipes-devtools/ccache/ccache_3.2.5.bb
 create mode 100644 meta/recipes-devtools/ccache/files/Revert-Create-man-page-in-the-make-install-from-git-.patch
 create mode 100644 meta/recipes-devtools/git/git_2.9.2.bb
 delete mode 100644 meta/recipes-devtools/guile/files/0001-libguile-Check-for-strtol_l-during-configure.patch
 delete mode 100644 meta/recipes-devtools/guile/files/libguile-VM-ASM_MUL-for-ARM-Add-earlyclobber.patch
 delete mode 100644 meta/recipes-devtools/guile/files/remove_strcase_l_funcs.patch
 rename meta/recipes-devtools/guile/{guile_2.0.11.bb => guile_2.0.12.bb} (91%)
 delete mode 100644 meta/recipes-extended/slang/slang/change-char-type-to-signed-char-in-macros.patch
 delete mode 100644 meta/recipes-extended/slang/slang/sprintf-bug-concerning-8-bit-characters.patch
 rename meta/recipes-extended/slang/{slang_2.2.4.bb => slang_2.3.0.bb} (82%)
Signature · 1 line
2.9.0
#1 lore raw

PATCH v2 1/7 git: 2.8.4 -> 2.9.2

---
 meta/recipes-devtools/git/git_2.9.2.bb | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 meta/recipes-devtools/git/git_2.9.2.bb
meta/recipes-devtools/git/git_2.9.2.bb new file +11 -0
new file mode 100644
index 0000000..3eab96a
@@ -0,0 +1,11 @@
+require git.inc
+
+EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \
+                 ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \
+                 "
+EXTRA_OEMAKE += "NO_GETTEXT=1"
+
+SRC_URI[tarball.md5sum] = "7faff70073c2c4a503cd584071fabb84"
+SRC_URI[tarball.sha256sum] = "3cb09a3917c2d8150fc1708f3019cf99a8f0feee6cd61bba3797e3b2a85be9dc"
+SRC_URI[manpages.md5sum] = "6f8a2f890e40f18f4c96a5cd70722ad3"
+SRC_URI[manpages.sha256sum] = "ac5c600153d1e4a1c6494e250cd27ca288e7667ad8d4ea2f2386f60ba1b78eec"
Signature · 1 line
2.9.0
#2 lore raw

PATCH v2 2/7 guile: 2.0.11 -> 2.0.12

In reply to Robert Yang

* Remove these patches which already in the source:
- libguile-VM-ASM_MUL-for-ARM-Add-earlyclobber.patch
- remove_strcase_l_funcs.patch
- 0001-libguile-Check-for-strtol_l-during-configure.patch

* Update 0002-Recognize-nios2-as-compilation-target.patch

---
 ...guile-Check-for-strtol_l-during-configure.patch | 56 ----------------------
 ...002-Recognize-nios2-as-compilation-target.patch | 20 ++++----
 ...guile-VM-ASM_MUL-for-ARM-Add-earlyclobber.patch | 43 -----------------
 .../guile/files/remove_strcase_l_funcs.patch       | 38 ---------------
 .../guile/{guile_2.0.11.bb => guile_2.0.12.bb}     | 11 +----
 5 files changed, 10 insertions(+), 158 deletions(-)
 delete mode 100644 meta/recipes-devtools/guile/files/0001-libguile-Check-for-strtol_l-during-configure.patch
 delete mode 100644 meta/recipes-devtools/guile/files/libguile-VM-ASM_MUL-for-ARM-Add-earlyclobber.patch
 delete mode 100644 meta/recipes-devtools/guile/files/remove_strcase_l_funcs.patch
 rename meta/recipes-devtools/guile/{guile_2.0.11.bb => guile_2.0.12.bb} (91%)
meta/recipes-devtools/guile/files/0001-libguile-Check-for-strtol_l-during-configure.patch deleted +0 -56
deleted file mode 100644
index 24f073f..0000000
@@ -1,56 +0,0 @@
-From 814d6fb6c1f4a544c8fd37f5a390ba020c2d8c85 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Sun, 10 Jan 2016 22:28:17 +0000
-Subject: [PATCH] libguile: Check for strtol_l during configure
-
-strtol_l is a gnu extention which may not be available on other linux
-libc implementations e.g. musl. Therefore check for this funciton and
-conditionalize the use of it.
-
-Signed-off-by: Khem Raj <[email protected]>
----
-Upstream-Status: Pending
-
- configure.ac    | 5 +++--
- libguile/i18n.c | 2 +-
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 3969929..f8a6a1a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -752,7 +752,8 @@ AC_CHECK_HEADERS([assert.h crt_externs.h])
- #   truncate - not in mingw
- #   isblank - available as a GNU extension or in C99
- #   _NSGetEnviron - Darwin specific
--#   strcoll_l, newlocale - GNU extensions (glibc), also available on Darwin
-+#   strcoll_l, newlocale, strtol_l - GNU extensions (glibc),
-+#                                    also available on Darwin
- #   fork - unavailable on Windows
- #   utimensat - posix.1-2008
- #   sched_getaffinity, sched_setaffinity - GNU extensions (glibc)
-@@ -768,7 +769,7 @@ AC_CHECK_FUNCS([DINFINITY DQNAN cexp chsize clog clog10 ctermid		\
-   getgrent kill getppid getpgrp fork setitimer getitimer strchr strcmp	\
-   index bcopy memcpy rindex truncate unsetenv isblank _NSGetEnviron	\
-   strcoll strcoll_l newlocale utimensat sched_getaffinity		\
--  sched_setaffinity sendfile])
-+  sched_setaffinity sendfile strtol_l])
- 
- AM_CONDITIONAL([BUILD_ICE_9_POPEN],
-   [test "x$enable_posix" = "xyes" && test "x$ac_cv_func_fork" = "xyes"])
-diff --git a/libguile/i18n.c b/libguile/i18n.c
-index 97d44b0..9fb6976 100644
---- a/libguile/i18n.c
-+++ b/libguile/i18n.c
-@@ -1352,7 +1352,7 @@ SCM_DEFINE (scm_locale_string_to_integer, "locale-string->integer",
- 
-   if (c_locale != NULL)
-     {
--#ifdef USE_GNU_LOCALE_API
-+#if defined(USE_GNU_LOCALE_API) && defined(HAVE_STRTOL_L)
-       c_result = strtol_l (c_str, &c_endptr, c_base, c_locale);
- #else
-       RUN_IN_LOCALE_SECTION (c_locale,
--- 
-2.7.0
-
meta/recipes-devtools/guile/files/0002-Recognize-nios2-as-compilation-target.patch +8 -12
index 519585b..8e84747 100644
@@ -10,27 +10,23 @@ Upstream-Status: Submitted [ http://debbugs.gnu.org/cgi/bugreport.cgi?bug=22480
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/module/system/base/target.scm b/module/system/base/target.scm
-index d60a8e0..d1f6cff 100644
 --- a/module/system/base/target.scm
 +++ b/module/system/base/target.scm
 @@ -65,7 +65,7 @@
        (cond ((string-match "^i[0-9]86$" cpu)
               (endianness little))
              ((member cpu '("x86_64" "ia64"
--                           "powerpcle" "powerpc64le" "mipsel" "mips64el"))
-+                           "powerpcle" "powerpc64le" "mipsel" "mips64el" "nios2"))
+-                           "powerpcle" "powerpc64le" "mipsel" "mips64el" "sh4"))
++                           "powerpcle" "powerpc64le" "mipsel" "mips64el" "sh4" "nios2"))
               (endianness little))
              ((member cpu '("sparc" "sparc64" "powerpc" "powerpc64" "spu"
-                            "mips" "mips64"))
-@@ -100,7 +100,7 @@
+                            "mips" "mips64" "m68k" "s390x"))
+@@ -108,7 +108,7 @@
  
            ((string-match "64$" cpu) 8)
-           ((string-match "64[lbe][lbe]$" cpu) 8)
--          ((member cpu '("sparc" "powerpc" "mips" "mipsel")) 4)
-+          ((member cpu '("sparc" "powerpc" "mips" "mipsel" "nios2")) 4)
+           ((string-match "64_?[lbe][lbe]$" cpu) 8)
+-          ((member cpu '("sparc" "powerpc" "mips" "mipsel" "m68k" "sh4")) 4)
++          ((member cpu '("sparc" "powerpc" "mips" "mipsel" "m68k" "sh4" "nios2")) 4)
+           ((member cpu '("s390x")) 8)
            ((string-match "^arm.*" cpu) 4)
            (else (error "unknown CPU word size" cpu)))))
- 
--- 
-2.7.0.rc3
-
meta/recipes-devtools/guile/files/libguile-VM-ASM_MUL-for-ARM-Add-earlyclobber.patch deleted +0 -43

43 lines not on this page · raw message

meta/recipes-devtools/guile/files/remove_strcase_l_funcs.patch deleted +0 -38
deleted file mode 100644
index e7a06fe..0000000
@@ -1,38 +0,0 @@
-These unused functions cause build failures with uclibc since they reference __uclibc_locale_struct
-and this is exposed by uclibc API headers only if C locales are built, but for OE we build full locale
-support
-
-Signed-off-by: Khem Raj <[email protected]>
-Upstream-Status: Pending
-Index: guile-2.0.11/libguile/i18n.c
-===================================================================
---- guile-2.0.11.orig/libguile/i18n.c
-+++ guile-2.0.11/libguile/i18n.c
-@@ -851,27 +851,6 @@ str_downcase (register char *dst, regist
-   *dst = '\0';
- }
- 
--#ifdef USE_GNU_LOCALE_API
--static inline void
--str_upcase_l (register char *dst, register const char *src,
--	      scm_t_locale locale)
--{
--  for (; *src != '\0'; src++, dst++)
--    *dst = toupper_l (*src, locale);
--  *dst = '\0';
--}
--
--static inline void
--str_downcase_l (register char *dst, register const char *src,
--		scm_t_locale locale)
--{
--  for (; *src != '\0'; src++, dst++)
--    *dst = tolower_l (*src, locale);
--  *dst = '\0';
--}
--#endif
--
--
- SCM_DEFINE (scm_string_locale_lt, "string-locale<?", 2, 1, 0,
- 	    (SCM s1, SCM s2, SCM locale),
- 	    "Compare strings @var{s1} and @var{s2} in a locale-dependent way."
meta/recipes-devtools/guile/guile_2.0.12.bb renamed from meta/recipes-devtools/guile/guile_2.0.11.bb +2 -9
similarity index 91%
rename from meta/recipes-devtools/guile/guile_2.0.11.bb
rename to meta/recipes-devtools/guile/guile_2.0.12.bb
index 6cefe66..d2fe511 100644
@@ -22,18 +22,11 @@ SRC_URI = "${GNU_MIRROR}/guile/guile-${PV}.tar.xz \
            file://arm_aarch64.patch \
            file://workaround-ice-ssa-corruption.patch \
            file://libguile-Makefile.am-hook.patch \
-           file://libguile-VM-ASM_MUL-for-ARM-Add-earlyclobber.patch \
-           file://remove_strcase_l_funcs.patch \
-           file://0001-libguile-Check-for-strtol_l-during-configure.patch \
            file://0002-Recognize-nios2-as-compilation-target.patch \
            "
 
-#           file://debian/0001-Change-guile-to-guile-X.Y-for-info-pages.patch
-#           file://opensuse/guile-turn-off-gc-test.patch
-
-SRC_URI[md5sum] = "03f1bce1a4983076d955003472306a13"
-SRC_URI[sha256sum] = "aed0a4a6db4e310cbdfeb3613fa6f86fddc91ef624c1e3f8937a6304c69103e2"
-
+SRC_URI[md5sum] = "081fdf80cd3a76f260a2a0d87f773d6b"
+SRC_URI[sha256sum] = "de8187736f9b260f2fa776ed39b52cb74dd389ccf7039c042f0606270196b7e9"
 
 inherit autotools gettext pkgconfig texinfo
 BBCLASSEXTEND = "native"
Signature · 1 line
2.9.0
#3 lore raw

PATCH v2 3/7 gnu-efi: 3.0.3 -> 3.0.4

In reply to Robert Yang

* Remove gnu-efi-Make-setjmp.S-portable-to-ARM.patch since it is already in the source.

* Updated LIC_FILES_CHKSUM
- The following files are gone:

    lib/arm/div64.S
    lib/arm/lib1funcs.S

- Updated md5sum for other files, they add the following words, which are still GPLv2+:
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice and this list of conditions, without modification.
2. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission.

Alternatively, this software may be distributed under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.

* Remove -mfpmath=sse from TUNE_CCARGS since gnu-efi doesn't support sse to fix the problem:
rtdata.c:1:0: error: SSE instruction set disabled, using 387 arithmetics [-Werror]

* gnu-efi's Makefile treats prefix as toolchain prefix, so don't export it, otherwise there would be errors:
/bin/sh: /usrgcc: No such file or directory

* Add aarch64-initplat.c-fix-const-qualifier.patch to fix build on aarch64:
initplat.c:44:35: error: initialization discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers]

---
 .../aarch64-initplat.c-fix-const-qualifier.patch   | 35 +++++++++++++++
 .../gnu-efi-Make-setjmp.S-portable-to-ARM.patch    | 50 ----------------------
 .../gnu-efi/{gnu-efi_3.0.3.bb => gnu-efi_3.0.4.bb} | 27 +++++++-----
 3 files changed, 52 insertions(+), 60 deletions(-)
 create mode 100644 meta/recipes-bsp/gnu-efi/gnu-efi/aarch64-initplat.c-fix-const-qualifier.patch
 delete mode 100644 meta/recipes-bsp/gnu-efi/gnu-efi/gnu-efi-Make-setjmp.S-portable-to-ARM.patch
 rename meta/recipes-bsp/gnu-efi/{gnu-efi_3.0.3.bb => gnu-efi_3.0.4.bb} (59%)
meta/recipes-bsp/gnu-efi/gnu-efi/aarch64-initplat.c-fix-const-qualifier.patch new file +35 -0
new file mode 100644
index 0000000..965f074
@@ -0,0 +1,35 @@
+From dc83b84dc8b4e71efce47143497aac6c126065cf Mon Sep 17 00:00:00 2001
+From: Robert Yang <[email protected]>
+Date: Mon, 18 Jul 2016 08:40:29 -0700
+Subject: [PATCH] lib/aarch64/initplat.c: fix const qualifier
+
+Fixed:
+initplat.c:44:35: error: initialization discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers]
+     unsigned char *p = dest, *q = src;
+                                   ^~~
+cc1: all warnings being treated as errors
+
+Upstream-Status: Pending
+
+Signed-off-by: Robert Yang <[email protected]>
+---
+ lib/aarch64/initplat.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/lib/aarch64/initplat.c b/lib/aarch64/initplat.c
+index 2ac03a7..aae7beb 100644
+--- a/lib/aarch64/initplat.c
++++ b/lib/aarch64/initplat.c
+@@ -41,7 +41,8 @@ void *memset(void *s, int c, __SIZE_TYPE__ n)
+ 
+ void *memcpy(void *dest, const void *src, __SIZE_TYPE__ n)
+ {
+-    unsigned char *p = dest, *q = src;
++    unsigned char *p = dest;
++    const unsigned char *q = src;
+ 
+     while (n--)
+         *p++ = *q++;
+-- 
+2.9.0
+
meta/recipes-bsp/gnu-efi/gnu-efi/gnu-efi-Make-setjmp.S-portable-to-ARM.patch deleted +0 -50

50 lines not on this page · raw message

meta/recipes-bsp/gnu-efi/gnu-efi_3.0.4.bb renamed from meta/recipes-bsp/gnu-efi/gnu-efi_3.0.3.bb +17 -10
similarity index 59%
rename from meta/recipes-bsp/gnu-efi/gnu-efi_3.0.3.bb
rename to meta/recipes-bsp/gnu-efi/gnu-efi_3.0.4.bb
index 6b130a2..e0d8ee7 100644
@@ -2,27 +2,25 @@ SUMMARY = "Libraries for producing EFI binaries"
 HOMEPAGE = "http://sourceforge.net/projects/gnu-efi/"
 SECTION = "devel"
 LICENSE = "GPLv2+ | BSD-2-Clause"
-LIC_FILES_CHKSUM = "file://gnuefi/crt0-efi-arm.S;beginline=4;endline=9;md5=2240d7bbdf0928294c2f4a68b14d6591 \
+LIC_FILES_CHKSUM = "file://gnuefi/crt0-efi-arm.S;beginline=4;endline=16;md5=e582764a4776e60c95bf9ab617343d36 \
                     file://gnuefi/crt0-efi-aarch64.S;beginline=4;endline=16;md5=e582764a4776e60c95bf9ab617343d36 \
                     file://inc/efishellintf.h;beginline=13;endline=20;md5=202766b79d708eff3cc70fce15fb80c7 \
                     file://inc/efishellparm.h;beginline=4;endline=11;md5=468b1231b05bbc84bae3a0d5774e3bb5 \
-                    file://lib/arm/div64.S;beginline=6;endline=12;md5=a96c84f5ad12b4f011f98b5d039242f2 \
-                    file://lib/arm/math.c;beginline=4;endline=10;md5=64dd1987cee1dcf59d11aa572cfa644e \
-                    file://lib/arm/initplat.c;beginline=4;endline=10;md5=64dd1987cee1dcf59d11aa572cfa644e \
-                    file://lib/arm/lib1funcs.S;beginline=9;endline=33;md5=f56d5ebbc87136bc66cfe24db82bcf01 \
-                    file://lib/aarch64/math.c;beginline=9;endline=33;md5=cfade4c560e033a7bb02dab282872c7d \
-                    file://lib/aarch64/initplat.c;beginline=9;endline=33;md5=900cb1ffbe3e1ded344102be921830f1 \
+                    file://lib/arm/math.c;beginline=2;endline=15;md5=8ed772501da77b2b3345aa6df8744c9e \
+                    file://lib/arm/initplat.c;beginline=2;endline=15;md5=8ed772501da77b2b3345aa6df8744c9e \
+                    file://lib/aarch64/math.c;beginline=2;endline=15;md5=8ed772501da77b2b3345aa6df8744c9e \
+                    file://lib/aarch64/initplat.c;beginline=2;endline=15;md5=8ed772501da77b2b3345aa6df8744c9e \
                    "
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2 \
            file://parallel-make-archives.patch \
            file://lib-Makefile-fix-parallel-issue.patch \
-           file://gnu-efi-Make-setjmp.S-portable-to-ARM.patch \
            file://gcc46-compatibility.patch \
+           file://aarch64-initplat.c-fix-const-qualifier.patch \
           "
 
-SRC_URI[md5sum] = "15a4bcbc18a9a5e8110ed955970622e6"
-SRC_URI[sha256sum] = "c530f21a15fd9c214dd92d29a6caa20fac989289267512020b6da1f5e6f5b4cb"
+SRC_URI[md5sum] = "612e0f327f31c4b8468ef55f4eeb9649"
+SRC_URI[sha256sum] = "51a00428c3ccb96db24089ed8394843c4f83cf8f42c6a4dfddb4b7c23f2bf8af"
 
 COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*)-linux"
 COMPATIBLE_HOST_armv4 = 'null'
@@ -38,6 +36,10 @@ EXTRA_OEMAKE = "'ARCH=${@gnu_efi_arch(d)}' 'CC=${CC}' 'AS=${AS}' 'LD=${LD}' 'AR=
                 'RANLIB=${RANLIB}' 'OBJCOPY=${OBJCOPY}' 'PREFIX=${prefix}' 'LIBDIR=${libdir}' \
                 "
 
+# gnu-efi's Makefile treats prefix as toolchain prefix, so don't
+# export it.
+prefix[unexport] = "1"
+
 do_install() {
         oe_runmake install INSTALLROOT="${D}"
 }
@@ -45,3 +47,8 @@ do_install() {
 FILES_${PN} += "${libdir}/*.lds"
 
 BBCLASSEXTEND = "native"
+
+# It doesn't support sse, its make.defaults sets:
+# CFLAGS += -mno-mmx -mno-sse
+# So also remove -mfpmath=sse from TUNE_CCARGS
+TUNE_CCARGS_remove = "-mfpmath=sse"
Signature · 1 line
2.9.0
#4 lore raw

PATCH v2 4/7 slang: 2.2.4 -> 2.3.0

In reply to Robert Yang

* Removed:
change-char-type-to-signed-char-in-macros.patch
sprintf-bug-concerning-8-bit-characters.patch
They are already in the source.

* Updated:
fix-check-pcre.patch
fix-check-pcre.patch
slang-fix-the-iconv-existence-checking.patch

* Use SECURITY_NO_PIE_CFLAGS for SECURITY_CFLAGS, it can't be built with
"-pie -fpie":
tmp/sysroots/qemux86-64/usr/lib64/../lib64/Scrt1.o: In function `_start':
/usr/src/debug/glibc/2.24-r0/git/csu/../sysdeps/x86_64/start.S:104: undefined reference to main' /tmp/ccMFTA8A.o: In function smg_char_at':
/usr/src/debug/slang/2.3.0-r0/slang-2.3.0/modules/slsmg-module.c:134: undefined reference to SLsmg_char_at' /tmp/ccMFTA8A.o: In function smg_resume_smg':

---
 meta/conf/distro/include/security_flags.inc        |   1 +
 ...change-char-type-to-signed-char-in-macros.patch | 218 ---------------------
 .../slang/slang/fix-check-pcre.patch               |  30 +--
 meta/recipes-extended/slang/slang/rpathfix.patch   |  18 +-
 .../slang-fix-the-iconv-existence-checking.patch   |  31 +--
 .../sprintf-bug-concerning-8-bit-characters.patch  |  42 ----
 .../slang/{slang_2.2.4.bb => slang_2.3.0.bb}       |   9 +-
 7 files changed, 58 insertions(+), 291 deletions(-)
 delete mode 100644 meta/recipes-extended/slang/slang/change-char-type-to-signed-char-in-macros.patch
 delete mode 100644 meta/recipes-extended/slang/slang/sprintf-bug-concerning-8-bit-characters.patch
 rename meta/recipes-extended/slang/{slang_2.2.4.bb => slang_2.3.0.bb} (82%)
meta/conf/distro/include/security_flags.inc +1 -0
index a7be185..d953161 100644
@@ -86,6 +86,7 @@ SECURITY_CFLAGS_pn-python3 = "${SECURITY_NO_PIE_CFLAGS}"
 # Revert RPM to using internally supported values
 SECURITY_CFLAGS_pn-rpm = "${lcl_maybe_fortify} -fstack-protector"
 SECURITY_CFLAGS_pn-syslinux = "${SECURITY_NO_PIE_CFLAGS}"
+SECURITY_CFLAGS_pn-slang = "${SECURITY_NO_PIE_CFLAGS}"
 SECURITY_CFLAGS_pn-tcl = "${SECURITY_NO_PIE_CFLAGS}"
 SECURITY_CFLAGS_pn-tiff = "${SECURITY_NO_PIE_CFLAGS}"
 SECURITY_CFLAGS_pn-uclibc = ""
meta/recipes-extended/slang/slang/change-char-type-to-signed-char-in-macros.patch deleted +0 -218

218 lines not on this page · raw message

meta/recipes-extended/slang/slang/fix-check-pcre.patch +19 -11
index 0c1553a..a0ec0ff 100644
@@ -11,14 +11,13 @@ this off.
 Upstream-Status: Inappropriate
 Signed-off-by: Roy.Li <[email protected]>
 ---
- configure |   60 ++++++------------------------------------------------------
- 1 files changed, 6 insertions(+), 54 deletions(-)
+ configure |   72 +++++---------------------------------------------------------
+ 1 file changed, 6 insertions(+), 66 deletions(-)
 
 diff --git a/configure b/configure
-index f1586c3..d22814f 100755
 --- a/configure
 +++ b/configure
-@@ -6991,6 +6991,7 @@ $as_echo_n "checking for the pcre library and header files ... " >&6; }
+@@ -7191,6 +7191,7 @@ $as_echo_n "checking for the pcre library and header files ... " >&6; }
  	 /usr/include/pcre,/usr/lib \
  	 /usr/pcre/include,/usr/pcre/lib \
  	 /usr/include,/usr/lib \
@@ -26,7 +25,7 @@ index f1586c3..d22814f 100755
  	 /opt/include/pcre,/opt/lib \
  	 /opt/pcre/include,/opt/pcre/lib \
  	 /opt/include,/opt/lib"
-@@ -7021,14 +7022,14 @@ $as_echo_n "checking for the pcre library and header files ... " >&6; }
+@@ -7221,14 +7222,14 @@ $as_echo_n "checking for the pcre library and header files ... " >&6; }
          xincdir=`echo $include_and_lib | tr ',' ' ' | awk '{print $1}'`
  	xlibdir=`echo $include_and_lib | tr ',' ' ' | awk '{print $2}'`
  	found=0
@@ -45,7 +44,7 @@ index f1586c3..d22814f 100755
  	      jd_with_pcre_library="yes"
  	      found=1
  	      break
-@@ -7054,56 +7055,7 @@ $as_echo "yes: $jd_pcre_library_dir and $jd_pcre_include_dir" >&6; }
+@@ -7255,68 +7255,7 @@ $as_echo "yes: $jd_pcre_library_dir and $jd_pcre_include_dir" >&6; }
      then
        PCRE_LIB=""
      else
@@ -74,7 +73,7 @@ index f1586c3..d22814f 100755
 -      fi
 -    fi
 -  ;;
--  *osf*|*openbsd*)
+-  *osf*|*openbsd*|*freebsd*)
 -    if test "X$GCC" = Xyes
 -    then
 -      RPATH="-Wl,-rpath,"
@@ -95,7 +94,19 @@ index f1586c3..d22814f 100755
 -      RPATH="$RPATH$jd_pcre_library_dir"
 -    fi
 -  else
--    RPATH="$RPATH:$jd_pcre_library_dir"
+-    _already_there=0
+-    for X in `echo $RPATH | sed 's/:/ /g'`
+-    do
+-      if test "$X" = "$jd_pcre_library_dir"
+-      then
+-        _already_there=1
+-	break
+-      fi
+-    done
+-    if test $_already_there = 0
+-    then
+-      RPATH="$RPATH:$jd_pcre_library_dir"
+-    fi
 -  fi
 -fi
 -
@@ -103,6 +114,3 @@ index f1586c3..d22814f 100755
      fi
  
      PCRE_INC=-I$jd_pcre_include_dir
--- 
-1.7.4.1
-
meta/recipes-extended/slang/slang/rpathfix.patch +15 -3
index 50cac92..f82a531 100644
@@ -10,7 +10,7 @@ Index: slang-2.2.4/configure
 ===================================================================
 --- slang-2.2.4.orig/configure	2012-03-14 23:40:01.283560679 +0000
 +++ slang-2.2.4/configure	2012-03-14 23:41:18.023558900 +0000
-@@ -6081,56 +6081,7 @@
+@@ -6246,68 +6246,7 @@ esac
  ELF_CFLAGS="$ELF_CFLAGS $IEEE_CFLAGS"
  CFLAGS="$CFLAGS $IEEE_CFLAGS"
  
@@ -39,7 +39,7 @@ Index: slang-2.2.4/configure
 -      fi
 -    fi
 -  ;;
--  *osf*|*openbsd*)
+-  *osf*|*openbsd*|*freebsd*)
 -    if test "X$GCC" = Xyes
 -    then
 -      RPATH="-Wl,-rpath,"
@@ -60,7 +60,19 @@ Index: slang-2.2.4/configure
 -      RPATH="$RPATH$libdir"
 -    fi
 -  else
--    RPATH="$RPATH:$libdir"
+-    _already_there=0
+-    for X in `echo $RPATH | sed 's/:/ /g'`
+-    do
+-      if test "$X" = "$libdir"
+-      then
+-        _already_there=1
+-	break
+-      fi
+-    done
+-    if test $_already_there = 0
+-    then
+-      RPATH="$RPATH:$libdir"
+-    fi
 -  fi
 -fi
 -
meta/recipes-extended/slang/slang/slang-fix-the-iconv-existence-checking.patch +20 -11
index 958fe98..850551e 100644
@@ -19,14 +19,14 @@ Upstream-Status: Inappropriate
 
 Signed-off-by: Zheng Junling <[email protected]>
 ---
- configure | 60 ++++++------------------------------------------------------
- 1 file changed, 6 insertions(+), 54 deletions(-)
+ configure |   72 +++++---------------------------------------------------------
+ 1 file changed, 6 insertions(+), 66 deletions(-)
 
 diff --git a/configure b/configure
-index 7a96256..91632f3 100755
+index fa395ff..7fa769c 100755
 --- a/configure
 +++ b/configure
-@@ -7909,6 +7909,7 @@ $as_echo_n "checking for the iconv library and header files ... " >&6; }
+@@ -8259,6 +8259,7 @@ $as_echo_n "checking for the iconv library and header files ... " >&6; }
  	 /usr/include/iconv,/usr/lib \
  	 /usr/iconv/include,/usr/iconv/lib \
  	 /usr/include,/usr/lib \
@@ -34,7 +34,7 @@ index 7a96256..91632f3 100755
  	 /opt/include/iconv,/opt/lib \
  	 /opt/iconv/include,/opt/iconv/lib \
  	 /opt/include,/opt/lib"
-@@ -7939,14 +7940,14 @@ $as_echo_n "checking for the iconv library and header files ... " >&6; }
+@@ -8289,14 +8290,14 @@ $as_echo_n "checking for the iconv library and header files ... " >&6; }
          xincdir=`echo $include_and_lib | tr ',' ' ' | awk '{print $1}'`
  	xlibdir=`echo $include_and_lib | tr ',' ' ' | awk '{print $2}'`
  	found=0
@@ -53,7 +53,7 @@ index 7a96256..91632f3 100755
  	      jd_with_iconv_library="yes"
  	      found=1
  	      break
-@@ -7972,56 +7973,7 @@ $as_echo "yes: $jd_iconv_library_dir and $jd_iconv_include_dir" >&6; }
+@@ -8201,68 +8201,7 @@ $as_echo "yes: $jd_iconv_library_dir and $jd_iconv_include_dir" >&6; }
      then
        ICONV_LIB=""
      else
@@ -82,7 +82,7 @@ index 7a96256..91632f3 100755
 -      fi
 -    fi
 -  ;;
--  *osf*|*openbsd*)
+-  *osf*|*openbsd*|*freebsd*)
 -    if test "X$GCC" = Xyes
 -    then
 -      RPATH="-Wl,-rpath,"
@@ -103,7 +103,19 @@ index 7a96256..91632f3 100755
 -      RPATH="$RPATH$jd_iconv_library_dir"
 -    fi
 -  else
--    RPATH="$RPATH:$jd_iconv_library_dir"
+-    _already_there=0
+-    for X in `echo $RPATH | sed 's/:/ /g'`
+-    do
+-      if test "$X" = "$jd_iconv_library_dir"
+-      then
+-        _already_there=1
+-	break
+-      fi
+-    done
+-    if test $_already_there = 0
+-    then
+-      RPATH="$RPATH:$jd_iconv_library_dir"
+-    fi
 -  fi
 -fi
 -
@@ -111,6 +123,3 @@ index 7a96256..91632f3 100755
      fi
  
      ICONV_INC=-I$jd_iconv_include_dir
--- 
-1.8.3.4
-
meta/recipes-extended/slang/slang/sprintf-bug-concerning-8-bit-characters.patch deleted +0 -42

42 lines not on this page · raw message

meta/recipes-extended/slang/slang_2.3.0.bb renamed from meta/recipes-extended/slang/slang_2.2.4.bb +3 -6
similarity index 82%
rename from meta/recipes-extended/slang/slang_2.2.4.bb
rename to meta/recipes-extended/slang/slang_2.3.0.bb
index 237e9f2..17efbbe 100644
@@ -10,17 +10,14 @@ to recode S-Lang procedures in C if you need to."
 HOMEPAGE = "http://www.jedsoft.org/slang/"
 SECTION = "libs"
 DEPENDS = "pcre ncurses"
-PR = "r12"
 
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=a52a18a472d4f7e45479b06563717c02"
 
 
-SRC_URI = "http://www.jedsoft.org/releases/slang/old/slang-${PV}.tar.bz2 \
+SRC_URI = "http://www.jedsoft.org/releases/${BPN}/${BP}.tar.bz2 \
            file://rpathfix.patch \
            file://fix-check-pcre.patch \
-           file://change-char-type-to-signed-char-in-macros.patch \
-           file://sprintf-bug-concerning-8-bit-characters.patch \
            file://slang-fix-the-iconv-existence-checking.patch \
            file://0001-Fix-error-conflicting-types-for-posix_close.patch \
           "
@@ -30,8 +27,8 @@ inherit autotools-brokensep
 
 CLEANBROKEN = "1"
 
-SRC_URI[md5sum] = "7fcfd447e378f07dd0c0bae671fe6487"
-SRC_URI[sha256sum] = "9a8257a9a2a55099af858b13338dc8f3a06dd2069f46f0df2c9c3bb84a01d5db"
+SRC_URI[md5sum] = "3bcc790460d52db1316c20395b7ac2f1"
+SRC_URI[sha256sum] = "f95224060f45e0d8212a5039b339afa5f1a94a1bb0298e796104e5b12e926129"
 
 EXTRA_OECONF += " --without-z --without-png --without-onig --x-includes=${STAGING_DIR_HOST}/usr/include/X11 --x-libraries=${STAGING_DIR_HOST}/usr/lib"
 
Signature · 1 line
2.9.0
#5 lore raw

PATCH v2 5/7 gettext: 0.19.6 -> 0.19.8.1

In reply to Robert Yang
---
 .../add-with-bisonlocaledir.patch                                | 0
 .../gettext/{gettext-0.19.6 => gettext-0.19.8.1}/parallel.patch  | 0
 .../gettext/{gettext_0.19.6.bb => gettext_0.19.8.1.bb}           | 9 +++++++--
 3 files changed, 7 insertions(+), 2 deletions(-)
 rename meta/recipes-core/gettext/{gettext-0.19.6 => gettext-0.19.8.1}/add-with-bisonlocaledir.patch (100%)
 rename meta/recipes-core/gettext/{gettext-0.19.6 => gettext-0.19.8.1}/parallel.patch (100%)
 rename meta/recipes-core/gettext/{gettext_0.19.6.bb => gettext_0.19.8.1.bb} (93%)
meta/recipes-core/gettext/gettext-0.19.8.1/add-with-bisonlocaledir.patch renamed from meta/recipes-core/gettext/gettext-0.19.6/add-with-bisonlocaledir.patch +0 -0
similarity index 100%
rename from meta/recipes-core/gettext/gettext-0.19.6/add-with-bisonlocaledir.patch
rename to meta/recipes-core/gettext/gettext-0.19.8.1/add-with-bisonlocaledir.patch
meta/recipes-core/gettext/gettext-0.19.8.1/parallel.patch renamed from meta/recipes-core/gettext/gettext-0.19.6/parallel.patch +0 -0
similarity index 100%
rename from meta/recipes-core/gettext/gettext-0.19.6/parallel.patch
rename to meta/recipes-core/gettext/gettext-0.19.8.1/parallel.patch
meta/recipes-core/gettext/gettext_0.19.8.1.bb renamed from meta/recipes-core/gettext/gettext_0.19.6.bb +7 -2
similarity index 93%
rename from meta/recipes-core/gettext/gettext_0.19.6.bb
rename to meta/recipes-core/gettext/gettext_0.19.8.1.bb
index 592e4fc..7b8c1e8 100644
@@ -15,8 +15,8 @@ SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
 	   file://add-with-bisonlocaledir.patch \
 "
 
-SRC_URI[md5sum] = "6d1447f8c5c45c329371ef4bfe7d79a5"
-SRC_URI[sha256sum] = "ed4b4c19bd3a3034eb6769500a3592ff616759ef43cf30586dbb7a17c9dd695d"
+SRC_URI[md5sum] = "97e034cf8ce5ba73a28ff6c3c0638092"
+SRC_URI[sha256sum] = "ff942af0e438ced4a8b0ea4b0b6e0d6d657157c5e2364de57baa279c1c125c43"
 
 PACKAGECONFIG[msgcat-curses] = "--with-libncurses-prefix=${STAGING_LIBDIR}/..,--disable-curses,ncurses,"
 
@@ -70,6 +70,11 @@ PACKAGES =+ "gettext-runtime gettext-runtime-dev gettext-runtime-doc"
 
 FILES_${PN} += "${libdir}/${BPN}/*"
 
+# The its/Makefile.am has defined:
+# itsdir = $(pkgdatadir)$(PACKAGE_SUFFIX)/its
+# not itsdir = $(pkgdatadir), so use wildcard to match the version.
+FILES_${PN} += "${datadir}/${BPN}-*/*"
+
 FILES_gettext-runtime = "${bindir}/gettext \
                          ${bindir}/ngettext \
                          ${bindir}/envsubst \
Signature · 1 line
2.9.0
#6 lore raw

PATCH v2 6/7 gettext-minimal-native: 0.19.4 -> 0.19.8.1

In reply to Robert Yang

How to upgrade gettext-minimal-native:
- Build gettext-native
- Copy gettext-runtime/po/Makefile.in.in, build-aux/config.rpath and gettext-runtime/po/remove-potcdate.sin from gettext-native.
- Update COPYING when needed (usually update the year), do not copy the whole COPYING file from gettext-native.
- Go to gettext-native's ${S}/gettext-runtime/m4:

Quoted 3 lines

Remove lt*.m4 and libtool.m4
copy lib-ld.m4 lib-link.m4 lib-prefix.m4 from ${S}/gettext-runtime/gnulib-m4/ tar czvf /path/to/aclocal.tgz *.m4

---
 .../gettext/gettext-minimal-0.19.4/aclocal.tgz     | Bin 39744 -> 0 bytes
 ...-PATCH-Disable-the-test-to-convert-euc-jp.patch |   0
 .../COPYING                                        |   2 +-
 .../Makefile.in.in                                 |  44 +++++++++++++++------
 .../gettext/gettext-minimal-0.19.8.1/aclocal.tgz   | Bin 0 -> 40014 bytes
 .../config.rpath                                   |   2 +-
 .../remove-potcdate.sin                            |   0
 ....19.4.bb => gettext-minimal-native_0.19.8.1.bb} |   3 +-
 8 files changed, 34 insertions(+), 17 deletions(-)
 delete mode 100644 meta/recipes-core/gettext/gettext-minimal-0.19.4/aclocal.tgz
 rename meta/recipes-core/gettext/{gettext-minimal-0.19.4 => gettext-minimal-0.19.8.1}/0001-PATCH-Disable-the-test-to-convert-euc-jp.patch (100%)
 rename meta/recipes-core/gettext/{gettext-minimal-0.19.4 => gettext-minimal-0.19.8.1}/COPYING (76%)
 rename meta/recipes-core/gettext/{gettext-minimal-0.19.4 => gettext-minimal-0.19.8.1}/Makefile.in.in (91%)
 create mode 100644 meta/recipes-core/gettext/gettext-minimal-0.19.8.1/aclocal.tgz
 rename meta/recipes-core/gettext/{gettext-minimal-0.19.4 => gettext-minimal-0.19.8.1}/config.rpath (99%)
 rename meta/recipes-core/gettext/{gettext-minimal-0.19.4 => gettext-minimal-0.19.8.1}/remove-potcdate.sin (100%)
 rename meta/recipes-core/gettext/{gettext-minimal-native_0.19.4.bb => gettext-minimal-native_0.19.8.1.bb} (93%)
meta/recipes-core/gettext/gettext-minimal-0.19.4/aclocal.tgz deleted binary +0 -0
deleted file mode 100644
index b04ba55032e45b1d11545df227a1e9ca26bebf8e..0000000000000000000000000000000000000000
GIT binary patch
meta/recipes-core/gettext/gettext-minimal-0.19.8.1/0001-PATCH-Disable-the-test-to-convert-euc-jp.patch renamed from meta/recipes-core/gettext/gettext-minimal-0.19.4/0001-PATCH-Disable-the-test-to-convert-euc-jp.patch +0 -0
similarity index 100%
rename from meta/recipes-core/gettext/gettext-minimal-0.19.4/0001-PATCH-Disable-the-test-to-convert-euc-jp.patch
rename to meta/recipes-core/gettext/gettext-minimal-0.19.8.1/0001-PATCH-Disable-the-test-to-convert-euc-jp.patch
meta/recipes-core/gettext/gettext-minimal-0.19.8.1/COPYING renamed from meta/recipes-core/gettext/gettext-minimal-0.19.4/COPYING +1 -1
similarity index 76%
rename from meta/recipes-core/gettext/gettext-minimal-0.19.4/COPYING
rename to meta/recipes-core/gettext/gettext-minimal-0.19.8.1/COPYING
index 8d11d1d..3671ab6 100644
@@ -1,4 +1,4 @@
-dnl Copyright (C) 1995-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 1995-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
meta/recipes-core/gettext/gettext-minimal-0.19.8.1/Makefile.in.in renamed from meta/recipes-core/gettext/gettext-minimal-0.19.4/Makefile.in.in +31 -13

100 lines not on this page · raw message

meta/recipes-core/gettext/gettext-minimal-0.19.8.1/aclocal.tgz new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..9b2d1f561d734df608c9c7a6e29e08131296a5fd
GIT binary patch
meta/recipes-core/gettext/gettext-minimal-0.19.8.1/config.rpath renamed from meta/recipes-core/gettext/gettext-minimal-0.19.4/config.rpath +1 -1
similarity index 99%
rename from meta/recipes-core/gettext/gettext-minimal-0.19.4/config.rpath
rename to meta/recipes-core/gettext/gettext-minimal-0.19.8.1/config.rpath
index b625621..98183ff 100755
@@ -2,7 +2,7 @@
 # Output a system dependent set of variables, describing how to set the
 # run time search path of shared libraries in an executable.
 #
-#   Copyright 1996-2014 Free Software Foundation, Inc.
+#   Copyright 1996-2016 Free Software Foundation, Inc.
 #   Taken from GNU libtool, 2001
 #   Originally by Gordon Matzigkeit <[email protected]>, 1996
 #
meta/recipes-core/gettext/gettext-minimal-0.19.8.1/remove-potcdate.sin renamed from meta/recipes-core/gettext/gettext-minimal-0.19.4/remove-potcdate.sin +0 -0
similarity index 100%
rename from meta/recipes-core/gettext/gettext-minimal-0.19.4/remove-potcdate.sin
rename to meta/recipes-core/gettext/gettext-minimal-0.19.8.1/remove-potcdate.sin
meta/recipes-core/gettext/gettext-minimal-native_0.19.8.1.bb renamed from meta/recipes-core/gettext/gettext-minimal-native_0.19.4.bb +1 -2
similarity index 93%
rename from meta/recipes-core/gettext/gettext-minimal-native_0.19.4.bb
rename to meta/recipes-core/gettext/gettext-minimal-native_0.19.8.1.bb
index 1d4a443..26ff199 100644
@@ -15,11 +15,10 @@ INHIBIT_DEFAULT_DEPS = "1"
 INHIBIT_AUTOTOOLS_DEPS = "1"
 
 LICENSE = "FSF-Unlimited"
-LIC_FILES_CHKSUM = "file://COPYING;md5=1b20675cd5158442f6007d022f46b35b"
+LIC_FILES_CHKSUM = "file://COPYING;md5=4bd090a20bfcd1a18f1f79837b5e3e91"
 
 inherit native
 
-
 S = "${WORKDIR}"
 
 do_install () {
Signature · 1 line
2.9.0
#7 lore raw

PATCH v2 7/7 ccache: 3.2.4 -> 3.2.5

In reply to Robert Yang

Add Revert-Create-man-page-in-the-make-install-from-git-.patch to disable asciidoc since we don't have it.

---
 meta/recipes-devtools/ccache/ccache_3.2.4.bb       | 10 -------
 meta/recipes-devtools/ccache/ccache_3.2.5.bb       | 11 ++++++++
 ...te-man-page-in-the-make-install-from-git-.patch | 33 ++++++++++++++++++++++
 3 files changed, 44 insertions(+), 10 deletions(-)
 delete mode 100644 meta/recipes-devtools/ccache/ccache_3.2.4.bb
 create mode 100644 meta/recipes-devtools/ccache/ccache_3.2.5.bb
 create mode 100644 meta/recipes-devtools/ccache/files/Revert-Create-man-page-in-the-make-install-from-git-.patch
meta/recipes-devtools/ccache/ccache_3.2.4.bb deleted +0 -10
deleted file mode 100644
index fd45e41..0000000
@@ -1,10 +0,0 @@
-require ccache.inc
-
-LICENSE = "GPLv3+"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b3c337e7664559a789d9f7a93e5283c1"
-
-SRCREV = "2254797f1c5cfb83c4272da7b138f7f47218eb7d"
-
-SRC_URI += " \
-            file://0002-dev.mk.in-fix-file-name-too-long.patch \
-"
meta/recipes-devtools/ccache/ccache_3.2.5.bb new file +11 -0
new file mode 100644
index 0000000..afd1b0e
@@ -0,0 +1,11 @@
+require ccache.inc
+
+LICENSE = "GPLv3+"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b8a4fa173ed91c1a5204ea4f9c9eadc3"
+
+SRCREV = "424d3ae1fb73444c6c38bf189f8fc048f66d6499"
+
+SRC_URI += " \
+            file://0002-dev.mk.in-fix-file-name-too-long.patch \
+            file://Revert-Create-man-page-in-the-make-install-from-git-.patch \
+"
meta/recipes-devtools/ccache/files/Revert-Create-man-page-in-the-make-install-from-git-.patch new file +33 -0
new file mode 100644
index 0000000..f0208b9
@@ -0,0 +1,33 @@
+From 94fabcdda5c7e54ccdbc1f0aeccb26ce30e61226 Mon Sep 17 00:00:00 2001
+From: Robert Yang <[email protected]>
+Date: Mon, 18 Jul 2016 19:53:00 -0700
+Subject: [PATCH] Revert "Create man page in the make-install-from-git-repo
+ case"
+
+This reverts commit b86784902d28defd5e475c8922de594787df4541.
+
+We dont' have asciidoc, so revert it.
+
+Upstream-Status: Inappropriate [OE-Core specific]
+
+Signed-off-by: Robert Yang <[email protected]>
+---
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index d474f2a..c6cdc04 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -76,7 +76,7 @@ ccache$(EXEEXT): $(ccache_objs) $(extra_libs)
+ 	$(CC) $(all_cflags) -o $@ $(ccache_objs) $(LDFLAGS) $(extra_libs) $(LIBS)
+ 
+ .PHONY: install
+-install: all $(srcdir)/ccache.1
++install: all
+ 	$(installcmd) -d $(DESTDIR)$(bindir)
+ 	$(installcmd) -m 755 ccache$(EXEEXT) $(DESTDIR)$(bindir)
+ 	$(installcmd) -d $(DESTDIR)$(mandir)/man1
+-- 
+2.9.0
+
Signature · 1 line
2.9.0