main/alpine-conf: upgrade to 3.8.0

4 files changed, 3 insertions, 102 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
deleted file mode 100644
index 12ef19533e..0000000000
--- a/main/alpine-conf/0001-setup-xorg-base-install-eudev.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From f767813981a88a5f2d2f518587ebe2ea134b1698 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Thu, 21 Jun 2018 11:56:58 +0000
-Subject: [PATCH] setup-xorg-base: install eudev
-
-the setup-udev script is provided by eudev
----
- setup-xorg-base.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup-xorg-base.in b/setup-xorg-base.in
-index a8e16cd..2e01c91 100644
---- a/setup-xorg-base.in
-+++ b/setup-xorg-base.in
-@@ -5,7 +5,7 @@
- 
- base_pkgs="xorg-server xf86-input-libinput eudev"
- 
--apk add pciutils
-+apk add pciutils eudev
- vgaline=$(lspci | grep -w VGA)
- 
- case "$vgaline" in
--- 
-2.17.1
-
diff --git a/main/alpine-conf/0001-update-kernel-add-additional-firmware-files.patch b/main/alpine-conf/0001-update-kernel-add-additional-firmware-files.patch
deleted file mode 100644
index 45f0b321d1..0000000000
--- a/main/alpine-conf/0001-update-kernel-add-additional-firmware-files.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 96b29f5dd64111b9d063a327e24247ced02c1427 Mon Sep 17 00:00:00 2001
-From: Carlo Landmeter <clandmeter@alpinelinux.org>
-Date: Tue, 19 Jun 2018 15:32:51 +0000
-Subject: [PATCH] update-kernel: add additional firmware files
-
----
- update-kernel.in | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/update-kernel.in b/update-kernel.in
-index 0d20371..aaf1cff 100644
---- a/update-kernel.in
-+++ b/update-kernel.in
-@@ -251,8 +251,20 @@ mkdir -p $MODLOOP/modules/firmware
- find $ROOT/lib/modules -type f -name "*.ko" | xargs modinfo -F firmware | sort -u | while read FW; do
- 	if [ -e "$ROOT/lib/firmware/$FW" ]; then
- 		install -pD $ROOT/lib/firmware/$FW $MODLOOP/modules/firmware/$FW
-+		# include nvram files if firmware is needed.
-+		[ -e "$ROOT/lib/firmware/${FW%.*}.txt" ] && install -pD \
-+		    $ROOT/lib/firmware/${FW%.*}.txt $MODLOOP/modules/firmware/${FW%.*}.txt
- 	fi
- done
-+
-+# include bluetooth firmware in modloop
-+if [ -d "$MODLOOP/modules/firmware/brcm" ]; then
-+	for _btfw in "$ROOT"/lib/firmware/brcm/*.hcd; do
-+		install -pD "$_btfw" \
-+			"$MODLOOP"/modules/firmware/brcm/"${_btfw##*/}"
-+	done
-+fi
-+
- mksquashfs $MODLOOP "$STAGING/$MODIMG" -comp xz -exit-on-error
- 
- mkinitfs $MKINITFS_ARGS -q -b $ROOT -F "$features base squashfs" \
--- 
-2.17.1
-
diff --git a/main/alpine-conf/0001-update-kernel-fix-install-of-firware.patch b/main/alpine-conf/0001-update-kernel-fix-install-of-firware.patch
deleted file mode 100644
index ba842d7714..0000000000
--- a/main/alpine-conf/0001-update-kernel-fix-install-of-firware.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 3342db32fa783c69188057ac182538fd4277979b Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Thu, 21 Jun 2018 06:11:28 +0000
-Subject: [PATCH] update-kernel: fix install of firware
-
-prevent to exit with error due to set -e, if last firmware does not have
-a *.txt file.
----
- update-kernel.in | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/update-kernel.in b/update-kernel.in
-index aaf1cff..4267042 100644
---- a/update-kernel.in
-+++ b/update-kernel.in
-@@ -252,8 +252,9 @@ find $ROOT/lib/modules -type f -name "*.ko" | xargs modinfo -F firmware | sort -
- 	if [ -e "$ROOT/lib/firmware/$FW" ]; then
- 		install -pD $ROOT/lib/firmware/$FW $MODLOOP/modules/firmware/$FW
- 		# include nvram files if firmware is needed.
--		[ -e "$ROOT/lib/firmware/${FW%.*}.txt" ] && install -pD \
--		    $ROOT/lib/firmware/${FW%.*}.txt $MODLOOP/modules/firmware/${FW%.*}.txt
-+		if [ -e "$ROOT/lib/firmware/${FW%.*}.txt" ]; then
-+			install -pD $ROOT/lib/firmware/${FW%.*}.txt $MODLOOP/modules/firmware/${FW%.*}.txt
-+		fi
- 	fi
- done
- 
--- 
-2.17.1
-
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD
index 3c8007376e..38f227cb9a 100644
--- a/main/alpine-conf/APKBUILD
+++ b/main/alpine-conf/APKBUILD
@@ -1,16 +1,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=alpine-conf
-pkgver=3.8.0_rc2
-pkgrel=3
+pkgver=3.8.0
+pkgrel=0
 pkgdesc="Alpine configuration management scripts"
 url=http://git.alpinelinux.org/cgit/$pkgname
 arch="all"
 license="MIT"
 depends="openrc>=0.24.1-r6 busybox>=1.26.1-r3"
 source="http://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.xz
-	0001-update-kernel-add-additional-firmware-files.patch
-	0001-update-kernel-fix-install-of-firware.patch
-	0001-setup-xorg-base-install-eudev.patch
 	"
 
 builddir="$srcdir"/$pkgname-$pkgver
@@ -27,7 +24,4 @@ package() {
 	done
 }
 
-sha512sums="3b5224c2484b47c858fcea9fca0d2a1a73db7151ae8ed02480ae05dea35eb6f5ed4c2ffd887686cd43ac701948319c74e2cb8ccb1ada4f64ab9c8c350a241208  alpine-conf-3.8.0_rc2.tar.xz
-faffb4d2e6da15f631211e36fdd8cdaedae91e8c00e09055f17130fef7ce073fadfa78deebedb1877768c1707fc1e0a2741496dea5b0831b2f2b12cef23555de  0001-update-kernel-add-additional-firmware-files.patch
-d6e9ce6935dbde887f8feaabe8f97ff05a823cc7d8c3f72d27fb67dbfdb2d2c39e7c6adea4d3c0a9c0d1497be4921c98a0c7be28734e034d5bb58ffbe6ab03ad  0001-update-kernel-fix-install-of-firware.patch
-8115c1ec92256c010af7943077645ccfac244a274c6987497aacb9df009b2bb8798b35c6d86e8e43da8ae11784107561e711bd66020318c8db116a02192c10fa  0001-setup-xorg-base-install-eudev.patch"
+sha512sums="402d01dbc2b2aa987658f689e8a88feda6a633a393e746d2db3ee108274ff20be21f292406fa4aad543a665edfaff342795deb2c59cbc8c2ff8577f8f7c2485d  alpine-conf-3.8.0.tar.xz"