Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (ff92cf658b0828b44dc0f2a82efd9367f0a2d2f9)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (ff92cf658b0828b44dc0f2a82efd9367f0a2d2f9)
  • Date: Wed, 15 Sep 2021 14:46:17 +0000

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

utils/qemu/BUILD | 1 -
utils/qemu/DEPENDS | 2 +-
utils/qemu/HISTORY | 5 +++++
utils/qemu/patches/musl-fix-duplicated-sysinfo.patch | 3 ++-
4 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit ff92cf658b0828b44dc0f2a82efd9367f0a2d2f9
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

qemu: some build fixes (glibc)

diff --git a/utils/qemu/BUILD b/utils/qemu/BUILD
index 2ddbfeb..86ad841 100755
--- a/utils/qemu/BUILD
+++ b/utils/qemu/BUILD
@@ -20,7 +20,6 @@ esac &&
--localstatedir="$INSTALL_ROOT/var" \
--target-list="$QEMU_ARCHS" \
--audio-drv-list="$QEMU_AUDIO" \
- --python=python2 \
$QEMU_OPTS \
$OPTS &&

diff --git a/utils/qemu/DEPENDS b/utils/qemu/DEPENDS
index c886c2c..11331f6 100755
--- a/utils/qemu/DEPENDS
+++ b/utils/qemu/DEPENDS
@@ -170,7 +170,7 @@ optional_depends jemalloc \
--{enable,disable}-jemalloc \
'for jemalloc support' &&

-optional_depends libssh2 \
+optional_depends libssh \
--{enable,disable}-libssh \
'for SSH block device support' &&

diff --git a/utils/qemu/HISTORY b/utils/qemu/HISTORY
index a497835..048a3dd 100644
--- a/utils/qemu/HISTORY
+++ b/utils/qemu/HISTORY
@@ -1,3 +1,8 @@
+2021-09-15 Thomas Orgis <sobukus AT sourcemage.org>
+ * patches/musl-fix-duplicated-sysinfo.patch: fix for glibc
+ * DEPENDS: needs libssh, not libssh2
+ * BUILD: remove python2 switch
+
2021-09-10 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 6.1.0
* DEPENDS: on musl hosts request musl 1.2.2+ (sigevent API)
diff --git a/utils/qemu/patches/musl-fix-duplicated-sysinfo.patch
b/utils/qemu/patches/musl-fix-duplicated-sysinfo.patch
index f81fa20..ff63003 100644
--- a/utils/qemu/patches/musl-fix-duplicated-sysinfo.patch
+++ b/utils/qemu/patches/musl-fix-duplicated-sysinfo.patch
@@ -1,9 +1,10 @@
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
-@@ -16,6 +16,9 @@
+@@ -16,6 +16,10 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#define _ATFILE_SOURCE
++#include <stdint.h> /* To possibly get __GLIBC__ definition. */
+#ifndef __GLIBC__
+#define _LINUX_SYSINFO_H /* to avoid duplicated sysinfo struct definition */
+#endif



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (ff92cf658b0828b44dc0f2a82efd9367f0a2d2f9), Thomas Orgis, 09/15/2021

Archive powered by MHonArc 2.6.24.

Top of Page