diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2024-05-17 09:08:43 +0200 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2024-05-17 12:24:44 +0200 |
commit | cdb24df950987f3e5410ca492d13b324e85838e6 (patch) | |
tree | c4fcc3864b83050c242a26875688aef5910d9121 | |
parent | 84e81fdd25e41ad7aae7b47c6ea3cf15dc16d869 (diff) | |
download | aports-cdb24df950987f3e5410ca492d13b324e85838e6.zip |
main/alpine-conf: upgrade to 3.18.0_rc2
-rw-r--r-- | main/alpine-conf/APKBUILD | 9 | ||||
-rw-r--r-- | main/alpine-conf/setup-disk-add-loongarch64-support.patch | 24 |
2 files changed, 3 insertions, 30 deletions
diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index cf36c5d62e3..673a7d06f48 100644 --- a/main/alpine-conf/APKBUILD +++ b/main/alpine-conf/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alpine-conf -pkgver=3.17.2 +pkgver=3.18.0_rc2 pkgrel=0 pkgdesc="Alpine configuration management scripts" url="https://git.alpinelinux.org/alpine-conf/about" @@ -8,9 +8,7 @@ arch="all" license="MIT" depends="openrc>=0.24.1-r6 busybox>=1.26.1-r3" checkdepends="kyua" -source="https://gitlab.alpinelinux.org/alpine/alpine-conf/-/archive/$pkgver/alpine-conf-$pkgver.tar.gz - setup-disk-add-loongarch64-support.patch - " +source="https://gitlab.alpinelinux.org/alpine/alpine-conf/-/archive/$pkgver/alpine-conf-$pkgver.tar.gz" build() { make VERSION=$pkgver-r$pkgrel @@ -28,6 +26,5 @@ check() { } sha512sums=" -4459ba5004a9c4272e606af9f4c21119d3c8ab8f55543c79a7b3469f0574232cf286cbb5887f338f1371d013236522f630bdf3f096c62fb886ce226d4065f386 alpine-conf-3.17.2.tar.gz -c8b2ff058e65e774de5254ee5f0b62360bf83e746790190c73f55cedcaf568f431902768d147310b4d6b1f1d80b87849cf09790384a38b650f6f889a36c8a6c1 setup-disk-add-loongarch64-support.patch +082d8d4c624b5e431a83b64c2a3667d7200f05e959203d046360ef5f828c7e70c091edfba5835910ad45e7e0792cb0accb8843c6536fe6a462bab59b2e5fbe96 alpine-conf-3.18.0_rc2.tar.gz " diff --git a/main/alpine-conf/setup-disk-add-loongarch64-support.patch b/main/alpine-conf/setup-disk-add-loongarch64-support.patch deleted file mode 100644 index a9f8120aeae..00000000000 --- a/main/alpine-conf/setup-disk-add-loongarch64-support.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 1512b22ae7cbd99f5f77a027fbd2b6acb3ec1615 Mon Sep 17 00:00:00 2001 -From: Jingyun Hua <huajingyun@loongson.cn> -Date: Mon, 18 Mar 2024 10:48:17 +0800 -Subject: [PATCH] setup-disk: add loongarch64 support - ---- - setup-disk.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/setup-disk.in b/setup-disk.in -index 56f5152..7f01bfb 100755 ---- a/setup-disk.in -+++ b/setup-disk.in -@@ -322,6 +322,7 @@ setup_grub() { - arm*) target=arm-efi ; fwa=arm ;; - aarch64) target=arm64-efi ; fwa=aa64 ;; - riscv64) target=riscv64-efi ; fwa=riscv64 ;; -+ loongarch64) target=loongarch64-efi ; fwa=loongarch64 ;; - esac - - # currently disabling nvram so grub doesnt call efibootmgr --- -2.27.0 - |