From ee9212b4e7ff8e8996a57eccac098d7bdb85e238 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Friberg?= <fsmnarmosta@posteo.net>
Date: Wed, 26 Feb 2020 23:27:12 +0200
Subject: [PATCH] Fix merge
---
device/device-samsung-nevisp/APKBUILD | 28 -----------------------
device/linux-samsung-nevisp/APKBUILD | 4 ----
firmware/firmware-samsung-nevisp/APKBUILD | 2 +-
3 files changed, 1 insertion(+), 33 deletions(-)
diff --git a/device/device-samsung-nevisp/APKBUILD b/device/device-samsung-nevisp/APKBUILD
index 80f99e65693..51435a68cca 100644
--- a/device/device-samsung-nevisp/APKBUILD
+++ b/device/device-samsung-nevisp/APKBUILD
@@ -4,11 +4,7 @@
pkgname="device-samsung-nevisp"
pkgdesc="Samsung Galaxy Fame GT-S6810P"
pkgver=0.2
-<<<<<<< HEAD
-pkgrel=5
-=======
pkgrel=0
->>>>>>> 056c97dacf38e5ccb43e2e14404d8d25605850ef
url="https://postmarketos.org"
license="MIT"
arch="armv7"
@@ -17,11 +13,6 @@ depends="postmarketos-base linux-samsung-nevisp mkbootimg mesa-dri-swrast msm-fb
makedepends="devicepkg-dev"
subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
source="deviceinfo
-<<<<<<< HEAD
-=======
- nvram_net.txt
- bcmdhd_sta.bin_b2
->>>>>>> 056c97dacf38e5ccb43e2e14404d8d25605850ef
modules-load.conf"
build() {
@@ -31,20 +22,7 @@ build() {
package() {
devicepkg_package $startdir $pkgname
install -Dm644 "$srcdir"/modules-load.conf \
-<<<<<<< HEAD
"$pkgdir"/etc/modules-load.d/00-$pkgname.conf
-=======
- "$pkgdir"/etc/modules-load.d/00-$pkgname.conf
-}
-
-nonfree_firmware() {
- pkgdesc="Wifi firmware"
- mkdir "$subpkgdir"
- install -D -m644 "$srcdir"/nvram_net.txt \
- "$subpkgdir"/lib/firmware/postmarketos/bcmdhd.cal
- install -D -m644 "$srcdir"/bcmdhd_sta.bin_b2 \
- "$subpkgdir"/lib/firmware/postmarketos/fw_bcmdhd.bin_b2
->>>>>>> 056c97dacf38e5ccb43e2e14404d8d25605850ef
}
nonfree_firmware() {
@@ -52,11 +30,5 @@ nonfree_firmware() {
depends="firmware-samsung-nevisp"
mkdir "$subpkgdir"
}
-
sha512sums="233d1fca39301b3ba995b6ae9a52aa19d7124efd2f452009f828d1fe0ae88fcde98a46257990adf75281d8cf99b3bf1d24c30ff949393e54f4f0e6a55a35734e deviceinfo
-<<<<<<< HEAD
-=======
-46a5ef749a2bdf7e4a4ec7efceae10f892b69fa2fdf22c778f3580e63b9c191ca30ec24eae3dbd447d05d8081ef2052188f1f7c8ad0c466f61f9b24388ddb130 nvram_net.txt
-5beb067b5d84e7979911100605e0ee6027b8c62249983d3c2720d19e3b9746645613356d0a6fec10757cc4e4db5f0fce1fc8c8809f91dc49cf32edb08d377cca bcmdhd_sta.bin_b2
->>>>>>> 056c97dacf38e5ccb43e2e14404d8d25605850ef
0aa06f2147be0ce89fb1ae418abff809ffa8de677afce4e3b29926ccea66f776065d2bb95675a8692230e40e57ec2ce657d9b3f79be56f1db35f4a724a3484f9 modules-load.conf"
diff --git a/device/linux-samsung-nevisp/APKBUILD b/device/linux-samsung-nevisp/APKBUILD
index 57b0f1366c3..6cb1894ce41 100644
--- a/device/linux-samsung-nevisp/APKBUILD
+++ b/device/linux-samsung-nevisp/APKBUILD
@@ -5,11 +5,7 @@
pkgname="linux-samsung-nevisp"
pkgver=3.0.101
-<<<<<<< HEAD
pkgrel=3
-=======
-pkgrel=1
->>>>>>> 056c97dacf38e5ccb43e2e14404d8d25605850ef
pkgdesc="Samsung Galaxy Fame GT-S6810P kernel fork"
arch="armv7"
_carch="arm"
diff --git a/firmware/firmware-samsung-nevisp/APKBUILD b/firmware/firmware-samsung-nevisp/APKBUILD
index ec270868a77..05c4a77b175 100644
--- a/firmware/firmware-samsung-nevisp/APKBUILD
+++ b/firmware/firmware-samsung-nevisp/APKBUILD
@@ -1,5 +1,5 @@
# Contributor: Théo Friberg <fsmnarmosta@posteo.net>
-# Maintainer: Théo Friberg <fsmnarmosta@posteo.net>§
+# Maintainer: Théo Friberg <fsmnarmosta@posteo.net>
pkgname="firmware-samsung-nevisp"
pkgver=1
pkgrel=114
--
GitLab