aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mageia.org>2019-10-15 14:14:35 +0000
committerPascal Terjan <pterjan@mageia.org>2019-10-15 14:16:23 +0000
commitef2cb0548e7863b5bffa5358e4e0be5ac83605f9 (patch)
treef01aa3f0120177533364ccad8879fb33ffff5235
parent32056020e7f6f897a5d5afd6582b20624d12a40e (diff)
downloadrpm-setup-ef2cb0548e7863b5bffa5358e4e0be5ac83605f9.tar
rpm-setup-ef2cb0548e7863b5bffa5358e4e0be5ac83605f9.tar.gz
rpm-setup-ef2cb0548e7863b5bffa5358e4e0be5ac83605f9.tar.bz2
rpm-setup-ef2cb0548e7863b5bffa5358e4e0be5ac83605f9.tar.xz
rpm-setup-ef2cb0548e7863b5bffa5358e4e0be5ac83605f9.zip
Actually make armv7hl chroots on armv8 work2.42
-rw-r--r--Makefile.am1
-rw-r--r--NEWS4
-rw-r--r--configure.ac2
3 files changed, 6 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 1ff4b4b..6e968e2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -100,6 +100,7 @@ edit = sed \
-e 's,@CANONTARGETCPU\@,$(CANONTARGETCPU),g' \
-e 's,@CANONTARGETGNU\@,$(CANONTARGETGNU),g' \
-e 's,@ARMV7CANONTARGETCPU\@,$(ARMV7CANONTARGETCPU),g' \
+ -e 's,@ARMV8CANONTARGETCPU\@,$(ARMV8CANONTARGETCPU),g' \
-e 's,@RPMALLARCH\@,$(RPMALLARCH),g' \
-e 's,@DISTSUFFIX\@,$(DISTSUFFIX),g'
diff --git a/NEWS b/NEWS
index 5b93257..3445bee 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Version 2.42 - 15 October 2019, by Pascal Terjan
+
+- actually make armv7hl chroots on aarch64 work as expected
+
Version 2.41 - 19 September 2019, by Thierry Vignaud
- fix %__libtoolize disapearing in rpm-4.15 (mga#25440)
diff --git a/configure.ac b/configure.ac
index 0d473dc..1d54ba9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ(2.59)
-AC_INIT(rpm-mageia-setup, 2.41, https://bugs.mageia.org/)
+AC_INIT(rpm-mageia-setup, 2.42, https://bugs.mageia.org/)
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE(1.9 -Wno-portability foreign no-dist-gzip dist-xz)
AC_CONFIG_SRCDIR