Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Merge branch 'jb49681' into 'master'
[aarch64] Make sure that files end up in the same place regardless of bits. Contributes to JB#49681 See merge request mer-core/systemd!33
- Loading branch information
Showing
3 changed files
with
183 additions
and
51 deletions.
There are no files selected for viewing
26 changes: 26 additions & 0 deletions
26
rpm/0001-aarch64-Force-udev-path.-Contributes-to-JB-49681.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,26 @@ | ||
From 23218f74c103cdd8205b68c1b1ab8416006f13af Mon Sep 17 00:00:00 2001 | ||
From: Niels Breet <niels.breet@jolla.com> | ||
Date: Mon, 6 Jul 2020 12:25:23 +0300 | ||
Subject: [PATCH] [aarch64] Force udev path. Contributes to JB#49681 | ||
|
||
--- | ||
Makefile.am | 3 ++- | ||
1 file changed, 2 insertions(+), 1 deletion(-) | ||
|
||
diff --git a/Makefile.am b/Makefile.am | ||
index c2973c0..2a969fe 100644 | ||
--- a/Makefile.am | ||
+++ b/Makefile.am | ||
@@ -100,7 +100,8 @@ systemshutdowndir=$(rootlibexecdir)/system-shutdown | ||
systemsleepdir=$(rootlibexecdir)/system-sleep | ||
systemunitdir=$(rootprefix)/lib/systemd/system | ||
systempresetdir=$(rootprefix)/lib/systemd/system-preset | ||
-udevlibexecdir=$(rootprefix)/lib/udev | ||
+#Force this to udevlibexecdir to /lib/udev for now, to make transition easier | ||
+udevlibexecdir=/lib/udev | ||
udevhomedir=$(udevlibexecdir) | ||
udevrulesdir=$(udevlibexecdir)/rules.d | ||
udevhwdbdir=$(udevlibexecdir)/hwdb.d | ||
-- | ||
1.9.1 | ||
|
26 changes: 26 additions & 0 deletions
26
rpm/0002-We-do-not-have-a-clean-environment-where-HAVE_SPIT_U.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,26 @@ | ||
From 5449d538f07df476e7341ee704803d240c8733e5 Mon Sep 17 00:00:00 2001 | ||
From: Niels Breet <niels.breet@jolla.com> | ||
Date: Mon, 6 Jul 2020 15:11:42 +0300 | ||
Subject: [PATCH] We do not have a clean environment where HAVE_SPIT_USR will | ||
actually work, so adding /sbin and /bin to path | ||
|
||
--- | ||
src/basic/path-util.h | 2 +- | ||
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
diff --git a/src/basic/path-util.h b/src/basic/path-util.h | ||
index 1eac89c..e58469f 100644 | ||
--- a/src/basic/path-util.h | ||
+++ b/src/basic/path-util.h | ||
@@ -26,7 +26,7 @@ | ||
#include "macro.h" | ||
#include "time-util.h" | ||
|
||
-#define DEFAULT_PATH_NORMAL "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin" | ||
+#define DEFAULT_PATH_NORMAL "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" | ||
#define DEFAULT_PATH_SPLIT_USR DEFAULT_PATH_NORMAL ":/sbin:/bin" | ||
|
||
#ifdef HAVE_SPLIT_USR | ||
-- | ||
1.9.1 | ||
|
Oops, something went wrong.