From 0921c2eaf10cc4b7b9019db040ba9eb8c7371898 Mon Sep 17 00:00:00 2001
From: Oliver Smith <ollieparanoid@bitmessage.ch>
Date: Sun, 17 Jun 2018 21:26:34 +0000
Subject: [PATCH] Fix conflict with mkbootimg and android-tools (#1557)

Alpine ships `mkbootimg` with the `android-tools` package now. This
conflicts with the `mkbootimg` fork from osm0sis (see #441).

Changes:
* Rename `mkbootimg` to `mkbootimg-osm0sis` (aport and binary name)
* `mkbootimg-osm0sis`: provides `mkbootimg` now (so we don't need to
  change all the device aports), update version to 2018.05.10
* Adjust our `mkinitfs` script to call `mkbootimg-osm0sis`
* Better aport description
* pkgrel_bump testcase: don't fail on deleted aport
---
 main/mkbootimg-osm0sis/APKBUILD        | 26 ++++++++++++++++++++++++++
 main/mkbootimg/APKBUILD                | 24 ------------------------
 main/postmarketos-mkinitfs/APKBUILD    |  4 ++--
 main/postmarketos-mkinitfs/mkinitfs.sh |  4 ++--
 4 files changed, 30 insertions(+), 28 deletions(-)
 create mode 100644 main/mkbootimg-osm0sis/APKBUILD
 delete mode 100644 main/mkbootimg/APKBUILD

diff --git a/main/mkbootimg-osm0sis/APKBUILD b/main/mkbootimg-osm0sis/APKBUILD
new file mode 100644
index 000000000..874f16d71
--- /dev/null
+++ b/main/mkbootimg-osm0sis/APKBUILD
@@ -0,0 +1,26 @@
+pkgname=mkbootimg-osm0sis
+pkgver=2018.05.10
+pkgrel=0
+pkgdesc="Android bootimg tools (maintained fork of the C version, see #441)"
+url="https://github.com/osm0sis/mkbootimg"
+arch="all"
+license="APACHE2"
+depends=""
+provides="mkbootimg=$pkgver unpackbootimg=$pkgver"
+replaces="mkbootimg"
+subpackages=""
+source="$pkgname-$pkgver.tar.gz::https://github.com/osm0sis/mkbootimg/archive/$pkgver.tar.gz"
+options="!check"
+builddir="$srcdir/mkbootimg-$pkgver"
+
+build() {
+	cd "$builddir"
+	make -j1
+}
+
+package() {
+	install -Dm755 "$builddir/mkbootimg" "${pkgdir}/usr/bin/mkbootimg-osm0sis"
+	install -Dm755 "$builddir/unpackbootimg" "${pkgdir}/usr/bin/unpackbootimg"
+}
+
+sha512sums="2f375b104f6a976c0e395afd4654f3d25aa3d786969150b342fa1020ef82dce6402cb9cc977c0ecbd421213eecaeedfce98ef1fc7d9105579ffee1e0d29becd6  mkbootimg-osm0sis-2018.05.10.tar.gz"
diff --git a/main/mkbootimg/APKBUILD b/main/mkbootimg/APKBUILD
deleted file mode 100644
index f6df016d1..000000000
--- a/main/mkbootimg/APKBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-pkgname=mkbootimg
-pkgver=2017.12.13
-pkgrel=0
-pkgdesc="Android bootimg creation tool"
-url="https://github.com/osm0sis/mkbootimg"
-arch="all"
-license="APACHE2"
-depends=""
-provides="unpackbootimg"
-subpackages=""
-source="$pkgname.tar.gz::https://github.com/osm0sis/$pkgname/archive/$pkgver.tar.gz"
-options="!check"
-workdir="$pkgname-$pkgver"
-
-build() {
-	make -j1
-}
-
-package() {
-	install -Dm755 "$srcdir/$workdir/mkbootimg" "${pkgdir}/usr/bin/mkbootimg"
-	install -Dm755 "$srcdir/$workdir/unpackbootimg" "${pkgdir}/usr/bin/unpackbootimg"
-}
-
-sha512sums="39820ee581f007b6e7c69f83ae6d54e99d32869604d1a960421c0c588fa55917f686104782b1e5ff5cb586f7efb19e9b9db11e69031cbb5e22462ab9d39cdc20  mkbootimg.tar.gz"
diff --git a/main/postmarketos-mkinitfs/APKBUILD b/main/postmarketos-mkinitfs/APKBUILD
index b8839288a..1e9094823 100644
--- a/main/postmarketos-mkinitfs/APKBUILD
+++ b/main/postmarketos-mkinitfs/APKBUILD
@@ -1,5 +1,5 @@
 pkgname=postmarketos-mkinitfs
-pkgver=0.6.5
+pkgver=0.6.6
 pkgrel=0
 pkgdesc="Tool to generate initramfs images for postmarketOS"
 url="https://github.com/postmarketOS"
@@ -25,4 +25,4 @@ package() {
 }
 sha512sums="d5abfe9a1298069e6722555c6e16223b09b36af65d879feb64d540aa6cbc009a3aa7f00528bcf656370ec37cc64f925c72ebb77813961cd6ebf22107b57ea029  init.sh.in
 1e39c077932ac3e1f068c1c438b22339b6d705f1358897fe738e64e2280e36346b6a65f0e50996e9a99b182c617d96995adc9263643afa5f46b4b93857fe73d6  init_functions.sh
-631007eb45fb2ec79532f746cda9d2f98e3d0853c0b0bdaed82e8f931fe3ddf9127274f200726fab8d3e41dbe0dfbab2c3ad359584218b04c2b07ef54f8b332b  mkinitfs.sh"
+3ecdf70c61fa862990b3afbec872f0498e0246017502aa22106782f8c5ef361902ad05473d6c2121db359f4f1d7e7a83da322e0d9f243825c4d1144358447164  mkinitfs.sh"
diff --git a/main/postmarketos-mkinitfs/mkinitfs.sh b/main/postmarketos-mkinitfs/mkinitfs.sh
index d05c51bf4..fc85b22ef 100644
--- a/main/postmarketos-mkinitfs/mkinitfs.sh
+++ b/main/postmarketos-mkinitfs/mkinitfs.sh
@@ -232,7 +232,7 @@ create_uboot_files()
 create_bootimg()
 {
 	[ "${deviceinfo_generate_bootimg}" == "true" ] || return
-	require_package "mkbootimg" "mkbootimg" "generate_bootimg"
+	require_package "mkbootimg-osm0sis" "mkbootimg" "generate_bootimg"
 
 	echo "==> initramfs: creating boot.img"
 	_base="${deviceinfo_flash_offset_base}"
@@ -256,7 +256,7 @@ create_bootimg()
 			exit 1
 		fi
 	fi
-	mkbootimg \
+	mkbootimg-osm0sis \
 		--kernel "${kernelfile}" \
 		--ramdisk "$outfile" \
 		--base "${_base}" \