Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'jb51353-update' into 'master'
Update libzypp to 17.24.2. See merge request mer-core/libzypp!30
- Loading branch information
Showing
11 changed files
with
374 additions
and
204 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| From 86e1f702c8348db64c84e6515004729e110e5e31 Mon Sep 17 00:00:00 2001 | ||
| From: Niels Breet <niels.breet@jolla.com> | ||
| Date: Tue, 27 Oct 2020 17:01:42 +0200 | ||
| Subject: [PATCH] Disable docs building with force | ||
|
|
||
| --- | ||
| CMakeLists.txt | 2 +- | ||
| 1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
|
||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index d3945f8..c548b77 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -319,7 +319,7 @@ ADD_SUBDIRECTORY( zypp ) | ||
| # do not build devel by default | ||
| ADD_SUBDIRECTORY( devel EXCLUDE_FROM_ALL ) | ||
| ADD_SUBDIRECTORY( tools ) | ||
| -ADD_SUBDIRECTORY( doc ) | ||
| +# ADD_SUBDIRECTORY( doc ) | ||
|
|
||
| IF ( ENABLE_BUILD_TRANS ) | ||
| ADD_SUBDIRECTORY( po ) | ||
| -- | ||
| 1.9.1 | ||
|
|
This file was deleted.
Oops, something went wrong.
65 changes: 65 additions & 0 deletions
65
rpm/0006-Use-rpm-platform-for-architecture-autodetection.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| From d55afcc05982769183c5d78e158157065a12d7db Mon Sep 17 00:00:00 2001 | ||
| From: =?UTF-8?q?Juho=20H=C3=A4m=C3=A4l=C3=A4inen?= | ||
| <juho.hamalainen@jolla.com> | ||
| Date: Wed, 25 Nov 2020 14:03:30 +0200 | ||
| Subject: [PATCH] Use rpm platform for architecture autodetection. | ||
| MIME-Version: 1.0 | ||
| Content-Type: text/plain; charset=UTF-8 | ||
| Content-Transfer-Encoding: 8bit | ||
|
|
||
| If /etc/rpm/platform file exists use the architecture defined. This way | ||
| we get correct behavior with for example aarch64 kernel and armv7hl | ||
| platform. | ||
|
|
||
| Signed-off-by: Juho Hämäläinen <juho.hamalainen@jolla.com> | ||
| --- | ||
| zypp/ZConfig.cc | 33 +++++++++++++++++++++++++++++++++ | ||
| 1 file changed, 33 insertions(+) | ||
|
|
||
| diff --git a/zypp/ZConfig.cc b/zypp/ZConfig.cc | ||
| index 3bf1185af..9ebccea51 100644 | ||
| --- a/zypp/ZConfig.cc | ||
| +++ b/zypp/ZConfig.cc | ||
| @@ -164,6 +164,39 @@ namespace zypp | ||
| architecture = Arch_ppc64p7; | ||
| } | ||
| #endif | ||
| + | ||
| + /* JB#51353 - We need to override architecture when we get certain architectures from uname | ||
| + * which don't match platform. For example aarch64 kernel with armv7hl platform. | ||
| + * This detection mimics what is implemented in kickstart file, writing platform architecture | ||
| + * to /etc/rpm/platform - rpm uses this file to get it right and we use it now as well. | ||
| + * */ | ||
| + std::ifstream rpm_platform( "/etc/rpm/platform" ); | ||
| + | ||
| + if ( rpm_platform ) | ||
| + { | ||
| + std::string rpmArch; | ||
| + | ||
| + for( iostr::EachLine in( rpm_platform ); in; in.next() ) | ||
| + { | ||
| + std::string s = *in; | ||
| + size_t pos = s.find ("-"); | ||
| + | ||
| + if ( pos != std::string::npos ) | ||
| + { | ||
| + rpmArch = s.substr (0, pos); | ||
| + break; | ||
| + } | ||
| + } | ||
| + | ||
| + if ( !rpmArch.empty() && rpmArch != architecture.asString() ) | ||
| + { | ||
| + MIL << "Uname is '" << architecture | ||
| + << "' but /etc/rpm/platform architecture is '" << rpmArch | ||
| + << "' - use what platform says." << endl; | ||
| + architecture = Arch(rpmArch); | ||
| + } | ||
| + } | ||
| + | ||
| return architecture; | ||
| } | ||
|
|
||
| -- | ||
| 2.25.1 | ||
|
|
Oops, something went wrong.