GitLab's annual major release is around the corner. Along with a lot of new and exciting features, there will be a few breaking changes. Learn more here.

Verified Commit 27b8ef36 authored by Bart Ribbers's avatar Bart Ribbers Committed by Oliver Smith
Browse files

*/*: replace uboot-tools dependency for u-boot-tools (MR 2141)

uboot-tools is provided by u-boot-tools but sometimes apk still gets
confused. This change prevents errors such as

pine64-pinephone:~$ sudo apk upgrade --verbose
WARNING: Failed to perform initial self-upgrade, continuing with full upgrade.
ERROR: unable to select packages:
  uboot-tools (virtual):
	    provided by: u-boot-tools
			    required by: device-pine64-pinephone-0.25-r1[uboot-tools]
[ci:ignore-count]
[ci:skip-build]: already built in CI successfully
parent 67b87528
Pipeline #293268538 passed with stages
in 1 minute and 30 seconds
......@@ -3,13 +3,13 @@
# Co-Maintainer: Daniele Debernardi <drebrez@gmail.com>
pkgname=device-nokia-n900
pkgver=7
pkgrel=2
pkgrel=3
pkgdesc="Nokia N900"
url="https://postmarketos.org"
arch="armv7"
license="MIT"
depends="postmarketos-base linux-nokia-n900 uboot-tools kbd kbd-bkeymaps ofono mesa-dri-swrast alsa-utils"
makedepends="devicepkg-dev uboot-tools kbd kbd-bkeymaps"
depends="postmarketos-base linux-nokia-n900 u-boot-tools kbd kbd-bkeymaps ofono mesa-dri-swrast alsa-utils"
makedepends="devicepkg-dev u-boot-tools kbd kbd-bkeymaps"
install="$pkgname.post-install"
subpackages="
$pkgname-weston
......
......@@ -4,7 +4,7 @@
pkgname=device-pine64-pinetab
pkgdesc="PINE64 PineTab"
pkgver=0.7
pkgrel=3
pkgrel=4
url="https://postmarketos.org"
license="MIT"
arch="aarch64"
......@@ -15,7 +15,7 @@ depends="
mesa-dri-gallium
postmarketos-base
u-boot-pinephone
uboot-tools
u-boot-tools
"
makedepends="devicepkg-dev"
subpackages="
......
......@@ -5,7 +5,7 @@
# Co-Maintainer: Clayton Craft <clayton@craftyguy.net>
pkgname=device-pine64-pinephone
pkgver=0.25
pkgrel=1
pkgrel=2
pkgdesc="PINE64 PinePhone"
url="https://postmarketos.org"
license="MIT"
......@@ -29,7 +29,7 @@ depends="
mesa-egl
postmarketos-base
u-boot-pinephone
uboot-tools
u-boot-tools
"
makedepends="devicepkg-dev"
install="$pkgname.post-install $pkgname.post-upgrade"
......
......@@ -4,7 +4,7 @@
pkgname=device-purism-librem5
pkgdesc="Purism Librem 5 Phone"
pkgver=1.19
pkgrel=1
pkgrel=2
_confver=36
_purismrel=1
# <librem5-base ver>.<purism release>
......@@ -22,7 +22,7 @@ depends="
mesa-egl
postmarketos-base
u-boot-librem5
uboot-tools
u-boot-tools
"
makedepends="devicepkg-dev"
builddir=$srcdir/librem5-base-pureos-$_confver
......
......@@ -2,13 +2,13 @@
pkgname=device-pine64-a64lts
pkgdesc="PINE64 A64-LTS"
pkgver=0.3
pkgrel=9
pkgrel=10
url="https://postmarketos.org"
license="MIT"
arch="aarch64"
options="!check !archcheck"
subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
depends="postmarketos-base linux-postmarketos-allwinner u-boot-pine64 uboot-tools mesa-dri-gallium"
depends="postmarketos-base linux-postmarketos-allwinner u-boot-pine64 u-boot-tools mesa-dri-gallium"
makedepends="devicepkg-dev"
source="
deviceinfo
......
......@@ -2,7 +2,7 @@
pkgname=device-pine64-dontbeevil
pkgdesc="PINE64 PinePhone Don't be evil devkit"
pkgver=0.1
pkgrel=21
pkgrel=22
url="https://postmarketos.org"
license="MIT"
arch="aarch64"
......@@ -14,7 +14,7 @@ subpackages="
$pkgname-kernel-shortts:kernel_shortts
$pkgname-kernel-longts:kernel_longts
"
depends="postmarketos-base u-boot-pine64 uboot-tools mesa-dri-gallium ofono"
depends="postmarketos-base u-boot-pine64 u-boot-tools mesa-dri-gallium ofono"
makedepends="devicepkg-dev"
install="$pkgname.post-install"
source="
......
......@@ -3,14 +3,14 @@
pkgname=device-purism-librem5dev
pkgdesc="Purism Librem 5 Devkit"
pkgver=1.3
pkgrel=1
pkgrel=2
url="https://postmarketos.org"
license="MIT"
arch="aarch64"
options="!check !archcheck"
depends="postmarketos-base
linux-purism-librem5
uboot-tools
u-boot-tools
u-boot-librem5-devkit
gpsd
mesa-dri-gallium
......
......@@ -2,12 +2,12 @@
pkgname=device-samsung-coreprimevelte
pkgdesc="Samsung Galaxy Core Prime LTE"
pkgver=0.1
pkgrel=1
pkgrel=2
url="https://postmarketos.org"
license="MIT"
arch="aarch64"
options="!check !archcheck"
depends="postmarketos-base linux-samsung-coreprimevelte mkbootimg mesa-dri-gallium uboot-tools pxa-mkbootimg"
depends="postmarketos-base linux-samsung-coreprimevelte mkbootimg mesa-dri-gallium u-boot-tools pxa-mkbootimg"
makedepends="devicepkg-dev"
source="deviceinfo"
......
......@@ -2,12 +2,12 @@
pkgname=device-tokio-techbook
pkgdesc="Tokio Techbook"
pkgver=0.1
pkgrel=2
pkgrel=3
url="https://postmarketos.org"
license="MIT"
arch="armv7"
options="!check !archcheck"
depends="postmarketos-base linux-tokio-techbook mesa-dri-swrast mkbootimg uboot-tools"
depends="postmarketos-base linux-tokio-techbook mesa-dri-swrast mkbootimg u-boot-tools"
makedepends="devicepkg-dev"
source="
......
# Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
pkgname=postmarketos-mkinitfs
pkgver=0.24
pkgrel=1
pkgrel=2
pkgdesc="Tool to generate initramfs images for postmarketOS"
url="https://postmarketos.org"
depends="
......@@ -56,5 +56,5 @@ sha512sums="4717bf24bd13fd4d90f3ab000ab43f7d61529515de224ebc86458ae709ebe0b50656
1a267dd958609263a4f24657f602ac0e4e0c724bf1284adec85e82d05c9b07553085edea5a56f7fa09d1652af232c72d4d39a06858c2a580ff830577b5f37d67 init.sh.in
34d7b0b527a75213b0cbd93305cbe7307da6f447ae9066b7627aa78fb6b88a025bbf4d5d0125f9ec8f4aad3a3c7ecdedf8b05cb4b44cd7e41f5ccef6d3c77c4a init_functions.sh
4f74995c52b3fd18ef77347dbbca4b3575d23fd339b62a257c1c4b45a16feb5a95f391d6189f62e94ac00d8da3077d192c678554a5f9b8190e34bf3fa6c86e95 mkinitfs.sh
0152b812bf0cfde0008c750bc5bd707e3849e4e1d20013644e2a576e5e687bcdbb824ffa6b40b1d7fb3faf77abb74527b41b81a47788f278cb40ea34185a0f70 mkinitfs_functions.sh
93dfd3516870d388d5d124c162c43a327aa716eeabbc8cbed3378711e9347ef76919c09dac051f833230caff7607008d4c38022cc1d910c7392012e22818e890 mkinitfs_functions.sh
c7a3c33daeb12b33ac72207191941c4d634f15c22958273b52af381a70ebaba1d3a9299483f0c447d9e66c560151fe7b9588bb4bbef2c8914f83185984ee4622 mkinitfs_test.sh"
......@@ -289,7 +289,7 @@ create_cpio_image()
# Required command check with useful error message
# $1: command (e.g. "mkimage")
# $2: package (e.g. "uboot-tools")
# $2: package (e.g. "u-boot-tools")
# $3: related deviceinfo variable (e.g. "generate_bootimg")
require_package()
{
......@@ -309,7 +309,7 @@ create_uboot_files()
fi
[ "${deviceinfo_generate_legacy_uboot_initfs}" = "true" ] || return
require_package "mkimage" "uboot-tools" "generate_legacy_uboot_initfs"
require_package "mkimage" "u-boot-tools" "generate_legacy_uboot_initfs"
echo "==> initramfs: creating uInitrd"
# shellcheck disable=SC2039
......
......@@ -2,13 +2,13 @@
# a driver for the display and supports efi loading operating systems
pkgname=u-boot-pinebookpro
pkgver=2020.07
pkgrel=0
pkgrel=1
pkgdesc="u-boot bootloader for the rk3399"
url="https://gitlab.denx.de/u-boot/u-boot"
arch="aarch64"
license="GPL-2.0-or-later OFL-1.1 BSD-2-Clause BSD-3-Clause eCos-2.0 IBM-pibs
ISC LGPL-2.0-only LGPL-2.1-only X11"
makedepends="$depends_dev bc dtc python3-dev swig bison flex openssl-dev arm-trusted-firmware-rk3399 uboot-tools"
makedepends="$depends_dev bc dtc python3-dev swig bison flex openssl-dev arm-trusted-firmware-rk3399 u-boot-tools"
options="!check"
source="
ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver//_/-}.tar.bz2
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment