Skip to content
Snippets Groups Projects
Commit 01a4dac7 authored by Natanael Copa's avatar Natanael Copa
Browse files

main/alpine-conf: fix qemu detection

parent c66a5a79
No related branches found
No related tags found
No related merge requests found
From 16f383629c1e41b44a9c75a02f190ef6ec8d3ad7 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 7 Jan 2021 18:14:07 +0100
Subject: [PATCH] setup-alpine: fix qemu detection
---
setup-alpine.in | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/setup-alpine.in b/setup-alpine.in
index 80e10ff..392290b 100644
--- a/setup-alpine.in
+++ b/setup-alpine.in
@@ -17,7 +17,8 @@ get_fqdn() {
}
is_qemu() {
- grep -q "QEMU" /proc/cpuinfo
+ grep -q "QEMU" /proc/cpuinfo \
+ || strings /sys/firmware/dmi/tables/DMI 2>/dev/null | grep -q QEMU
}
usage() {
--
2.30.0
# Maintainer: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alpine-conf pkgname=alpine-conf
pkgver=3.10.1 pkgver=3.10.1
pkgrel=1 pkgrel=2
pkgdesc="Alpine configuration management scripts" pkgdesc="Alpine configuration management scripts"
url="https://git.alpinelinux.org/alpine-conf/about" url="https://git.alpinelinux.org/alpine-conf/about"
arch="all" arch="all"
...@@ -9,6 +9,7 @@ license="MIT" ...@@ -9,6 +9,7 @@ license="MIT"
depends="openrc>=0.24.1-r6 busybox>=1.26.1-r3" depends="openrc>=0.24.1-r6 busybox>=1.26.1-r3"
source="https://gitlab.alpinelinux.org/alpine/alpine-conf/-/archive/$pkgver/alpine-conf-$pkgver.tar.gz source="https://gitlab.alpinelinux.org/alpine/alpine-conf/-/archive/$pkgver/alpine-conf-$pkgver.tar.gz
0001-setup-disk-dont-try-install-syslinux-on-unsupported-.patch 0001-setup-disk-dont-try-install-syslinux-on-unsupported-.patch
0001-setup-alpine-fix-qemu-detection.patch
" "
builddir="$srcdir"/$pkgname-$pkgver builddir="$srcdir"/$pkgname-$pkgver
...@@ -26,4 +27,5 @@ package() { ...@@ -26,4 +27,5 @@ package() {
} }
sha512sums="37153680e6fadd15d5c98d1906be0a1969cf2236fca085f79ccae987ad73ececede6d9fd9840bcc8ad9436e43cbe1342e0f4c7c61ca2277b1f2cf20ed33b8888 alpine-conf-3.10.1.tar.gz sha512sums="37153680e6fadd15d5c98d1906be0a1969cf2236fca085f79ccae987ad73ececede6d9fd9840bcc8ad9436e43cbe1342e0f4c7c61ca2277b1f2cf20ed33b8888 alpine-conf-3.10.1.tar.gz
ad93c895f844738e46134b8867cd0c3fe9d84b61b72dc2e697567a47e7b92f9a15be2a9d5194a7351242e929b98958dc537430b42e030452445991b80dbeaf35 0001-setup-disk-dont-try-install-syslinux-on-unsupported-.patch" ad93c895f844738e46134b8867cd0c3fe9d84b61b72dc2e697567a47e7b92f9a15be2a9d5194a7351242e929b98958dc537430b42e030452445991b80dbeaf35 0001-setup-disk-dont-try-install-syslinux-on-unsupported-.patch
c5cb016e3b5dc13b851e5c514977ce7c1a7a4645f4d34aec6795696b7b0c3dc602df19ce57c6618c62a9a639d9077409d4a89b803f31f461105ea72ece617c6d 0001-setup-alpine-fix-qemu-detection.patch"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment