CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

augeas: Upgrade 1.11.0 -> 1.12.0

Browse Source 
Remove patches for issues fixed upstream.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Adrian Bunk 2019-05-10 14:55:07 +03:00 committed by Khem Raj
parent d8fffe3c07
commit 073b89ea21
5 changed files with 4 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta-oe/recipes-support/augeas/augeas.inc
View File

@ -6,9 +6,7 @@ LICENSE = "LGPLv2.1+"
LIC_FILES_CHKSUM = "file://COPYING;md5=bbb461211a33b134d42ed5ee802b37ff"
SRC_URI = "http://download.augeas.net/${BP}.tar.gz \
file://add-missing-argz-conditional.patch \
file://sepbuildfix.patch \
file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
"
DEPENDS = "readline libxml2"

31
meta-oe/recipes-support/augeas/augeas/0001-Unset-need_charset_alias-when-building-for-musl.patch
View File

@ -1,31 +0,0 @@
From 32b15332e2130a54b25f4fbf6f58b407b851dd8f Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 13 Apr 2015 17:02:13 -0700
Subject: [PATCH] Unset need_charset_alias when building for musl
localcharset uses ac_cv_gnu_library_2_1 from glibc21.m4
which actually shoudl be fixed in gnulib and then all downstream
projects will get it eventually. For now we apply the fix to
coreutils
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
gnulib/lib/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnulib/lib/Makefile.am b/gnulib/lib/Makefile.am
index 963b22d..75788d2 100644
--- a/gnulib/lib/Makefile.am
+++ b/gnulib/lib/Makefile.am
@@ -463,7 +463,7 @@ install-exec-localcharset: all-local
case '$(host_os)' in \
darwin[56]*) \
need_charset_alias=true ;; \
- darwin* | cygwin* | mingw* | pw32* | cegcc*) \
+ darwin* | cygwin* | mingw* | pw32* | cegcc* | linux-musl*) \
need_charset_alias=false ;; \
*) \
need_charset_alias=true ;; \

27
meta-oe/recipes-support/augeas/augeas/add-missing-argz-conditional.patch
View File

@ -1,27 +0,0 @@
From 9a6e6374da7d7056db0950f0f7d6b8b905009775 Mon Sep 17 00:00:00 2001
From: Constantin Musca <constantinx.musca@intel.com>
Date: Fri, 15 Jul 2016 10:04:48 +0300
Subject: [PATCH] Add missing GL_GENERATE_ARGZ_H conditional
- GL_GENERATE_ARGZ_H is used in gnulib/lib/Makefile.am
Upstream-Status: Pending
Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
---
configure.ac | 2 ++
1 file changed, 2 insertions(+)
diff --git a/configure.ac b/configure.ac
index 72b6984..fb9653e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,6 +55,8 @@ AC_ARG_WITH([failmalloc],
AM_CONDITIONAL([WITH_FAILMALLOC], [test x$with_failmalloc != xno])
+AM_CONDITIONAL([GL_GENERATE_ARGZ_H], [test -n "$ARGZ_H"])
+
dnl --enable-debug=(yes|no)
AC_ARG_ENABLE([debug],
[AC_HELP_STRING([--enable-debug=no/yes],

4
meta-oe/recipes-support/augeas/augeas_1.11.0.bb
View File

@ -1,4 +0,0 @@
require augeas.inc
SRC_URI[md5sum] = "abf51f4c0cf3901d167f23687f60434a"
SRC_URI[sha256sum] = "393ce8f4055af89cd4c20bf903eacbbd909cf427891f41b56dc2ba66243ea0b0"

4
meta-oe/recipes-support/augeas/augeas_1.12.0.bb Normal file
View File

@ -0,0 +1,4 @@
require augeas.inc
SRC_URI[md5sum] = "74f1c7b8550f4e728486091f6b907175"
SRC_URI[sha256sum] = "321942c9cc32185e2e9cb72d0a70eea106635b50269075aca6714e3ec282cb87"