aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2018-06-21 11:58:54 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2018-06-21 11:58:54 +0000
commitbb022afc78bd86a5ffbc347523d10d28becab480 (patch)
tree86492634a3622227d8a0894a6dad0533b87e2b9d
parent39ac71674f6dcb682f1b1422e31973cc73d1f47d (diff)
downloadalpine_aports-bb022afc78bd86a5ffbc347523d10d28becab480.tar.bz2
alpine_aports-bb022afc78bd86a5ffbc347523d10d28becab480.tar.xz
alpine_aports-bb022afc78bd86a5ffbc347523d10d28becab480.zip
main/alpine-conf: fix setup-xorg-base
-rw-r--r--main/alpine-conf/0001-setup-xorg-base-install-eudev.patch26
-rw-r--r--main/alpine-conf/APKBUILD6
2 files changed, 30 insertions, 2 deletions
diff --git a/main/alpine-conf/0001-setup-xorg-base-install-eudev.patch b/main/alpine-conf/0001-setup-xorg-base-install-eudev.patch
new file mode 100644
index 0000000000..12ef19533e
--- /dev/null
+++ b/main/alpine-conf/0001-setup-xorg-base-install-eudev.patch
@@ -0,0 +1,26 @@
1From f767813981a88a5f2d2f518587ebe2ea134b1698 Mon Sep 17 00:00:00 2001
2From: Natanael Copa <ncopa@alpinelinux.org>
3Date: Thu, 21 Jun 2018 11:56:58 +0000
4Subject: [PATCH] setup-xorg-base: install eudev
5
6the setup-udev script is provided by eudev
7---
8 setup-xorg-base.in | 2 +-
9 1 file changed, 1 insertion(+), 1 deletion(-)
10
11diff --git a/setup-xorg-base.in b/setup-xorg-base.in
12index a8e16cd..2e01c91 100644
13--- a/setup-xorg-base.in
14+++ b/setup-xorg-base.in
15@@ -5,7 +5,7 @@
16
17 base_pkgs="xorg-server xf86-input-libinput eudev"
18
19-apk add pciutils
20+apk add pciutils eudev
21 vgaline=$(lspci | grep -w VGA)
22
23 case "$vgaline" in
24--
252.17.1
26
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD
index 762144ae7e..3c8007376e 100644
--- a/main/alpine-conf/APKBUILD
+++ b/main/alpine-conf/APKBUILD
@@ -1,7 +1,7 @@
1# Maintainer: Natanael Copa <ncopa@alpinelinux.org> 1# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
2pkgname=alpine-conf 2pkgname=alpine-conf
3pkgver=3.8.0_rc2 3pkgver=3.8.0_rc2
4pkgrel=2 4pkgrel=3
5pkgdesc="Alpine configuration management scripts" 5pkgdesc="Alpine configuration management scripts"
6url=http://git.alpinelinux.org/cgit/$pkgname 6url=http://git.alpinelinux.org/cgit/$pkgname
7arch="all" 7arch="all"
@@ -10,6 +10,7 @@ depends="openrc>=0.24.1-r6 busybox>=1.26.1-r3"
10source="http://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.xz 10source="http://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.xz
11 0001-update-kernel-add-additional-firmware-files.patch 11 0001-update-kernel-add-additional-firmware-files.patch
12 0001-update-kernel-fix-install-of-firware.patch 12 0001-update-kernel-fix-install-of-firware.patch
13 0001-setup-xorg-base-install-eudev.patch
13 " 14 "
14 15
15builddir="$srcdir"/$pkgname-$pkgver 16builddir="$srcdir"/$pkgname-$pkgver
@@ -28,4 +29,5 @@ package() {
28 29
29sha512sums="3b5224c2484b47c858fcea9fca0d2a1a73db7151ae8ed02480ae05dea35eb6f5ed4c2ffd887686cd43ac701948319c74e2cb8ccb1ada4f64ab9c8c350a241208 alpine-conf-3.8.0_rc2.tar.xz 30sha512sums="3b5224c2484b47c858fcea9fca0d2a1a73db7151ae8ed02480ae05dea35eb6f5ed4c2ffd887686cd43ac701948319c74e2cb8ccb1ada4f64ab9c8c350a241208 alpine-conf-3.8.0_rc2.tar.xz
30faffb4d2e6da15f631211e36fdd8cdaedae91e8c00e09055f17130fef7ce073fadfa78deebedb1877768c1707fc1e0a2741496dea5b0831b2f2b12cef23555de 0001-update-kernel-add-additional-firmware-files.patch 31faffb4d2e6da15f631211e36fdd8cdaedae91e8c00e09055f17130fef7ce073fadfa78deebedb1877768c1707fc1e0a2741496dea5b0831b2f2b12cef23555de 0001-update-kernel-add-additional-firmware-files.patch
31d6e9ce6935dbde887f8feaabe8f97ff05a823cc7d8c3f72d27fb67dbfdb2d2c39e7c6adea4d3c0a9c0d1497be4921c98a0c7be28734e034d5bb58ffbe6ab03ad 0001-update-kernel-fix-install-of-firware.patch" 32d6e9ce6935dbde887f8feaabe8f97ff05a823cc7d8c3f72d27fb67dbfdb2d2c39e7c6adea4d3c0a9c0d1497be4921c98a0c7be28734e034d5bb58ffbe6ab03ad 0001-update-kernel-fix-install-of-firware.patch
338115c1ec92256c010af7943077645ccfac244a274c6987497aacb9df009b2bb8798b35c6d86e8e43da8ae11784107561e711bd66020318c8db116a02192c10fa 0001-setup-xorg-base-install-eudev.patch"