Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (13d1b385aacf344f3ee9d4e8ba294276a0f5adb0)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (13d1b385aacf344f3ee9d4e8ba294276a0f5adb0)
  • Date: Thu, 9 Sep 2021 16:24:40 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

utils/qemu/HISTORY | 3 +++
utils/qemu/patches/musl-fix-duplicated-sysinfo.patch | 4 +++-
2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 13d1b385aacf344f3ee9d4e8ba294276a0f5adb0
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

qemu: Fix musl syscall.c patch for glibc

diff --git a/utils/qemu/HISTORY b/utils/qemu/HISTORY
index d548c23..b280831 100644
--- a/utils/qemu/HISTORY
+++ b/utils/qemu/HISTORY
@@ -1,3 +1,6 @@
+2021-09-09 Ismael Luceno <ismael AT sourcemage.org>
+ * patches/musl-fix-duplicated-sysinfo.patch: fixed for glibc
+
2020-09-07 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 5.1.0
TMPFS=OFF
diff --git a/utils/qemu/patches/musl-fix-duplicated-sysinfo.patch
b/utils/qemu/patches/musl-fix-duplicated-sysinfo.patch
index dbe8c17..f81fa20 100644
--- a/utils/qemu/patches/musl-fix-duplicated-sysinfo.patch
+++ b/utils/qemu/patches/musl-fix-duplicated-sysinfo.patch
@@ -1,10 +1,12 @@
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
-@@ -16,5 +16,6 @@
+@@ -16,6 +16,9 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#define _ATFILE_SOURCE
++#ifndef __GLIBC__
+#define _LINUX_SYSINFO_H /* to avoid duplicated sysinfo struct definition */
++#endif
#include "qemu/osdep.h"
#include "qemu/cutils.h"
#include "qemu/path.h"



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (13d1b385aacf344f3ee9d4e8ba294276a0f5adb0), Ismael Luceno, 09/09/2021

Archive powered by MHonArc 2.6.24.

Top of Page