David Runge pushed to branch main at Arch Linux / Packaging / Packages / mkosi
Commits: 48b030a7 by David Runge at 2023-08-10T11:48:37+02:00 Switch to SPDX version identifier. - - - - - 7173360c by David Runge at 2023-08-10T11:50:05+02:00 Use alphabetically sorted bash arrays with one entry per line for better handling - - - - - ae8b7bdd by David Runge at 2023-08-10T16:24:26+02:00 upgpkg: 15-1 Consolidate dependencies. Remove patch which is no longer needed. - - - - - 1 changed file: - PKGBUILD Changes: ===================================== PKGBUILD ===================================== @@ -4,25 +4,41 @@ # Contributor: Dave Reisner <[email protected]> pkgname=mkosi -pkgver=14 -pkgrel=3 +pkgver=15 +pkgrel=1 pkgdesc="Build Legacy-Free OS Images" arch=(any) url="https://github.com/systemd/mkosi"; -license=(LGPL2.1) -depends=(arch-install-scripts python python-pexpect qemu-img) -makedepends=(python-build python-installer python-setuptools python-wheel) -checkdepends=(python-pexpect python-pytest) +license=(LGPL-2.1-or-later) +depends=( + arch-install-scripts + python + python-pexpect +) +makedepends=( + pandoc-cli + python-build + python-installer + python-setuptools + python-setuptools-scm + python-wheel +) +checkdepends=( + python-pexpect + python-pytest + systemd +) optdepends=( 'btrfs-progs: raw_btrfs and subvolume output formats' + 'cryptsetup: add dm-verity partitions' 'debian-archive-keyring: build Debian images' 'debootstrap: build Debian or Ubuntu images' - 'cryptsetup: add dm-verity partitions' 'dosfstools: build bootable images' 'gnupg: sign images' + 'python-pefile: for bootable images' 'qemu: run bootable images using QEMU' 'sbsigntools: sign EFI binaries for UEFI SecureBoot' - 'squashfs-tools: raw_squashfs output format' + 'squashfs-tools: for creating custom scripts to output as squashfs' 'tar: tar output format' 'ubuntu-keyring: build Ubuntu images' 'xz: compress images with xz' @@ -30,21 +46,14 @@ optdepends=( ) source=( $pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz - $pkgname-14-fix_tests.patch::https://github.com/systemd/mkosi/commit/60289499675661169cd7bfda2faf331663a43c73.patch ) -sha512sums=('33a387bda9bd74415719d9081373936ead331135fc5c17276bace1a999ec1b90e6caea37fb0fd832bc89ca75635f3dbd1ed19af7679a7d8a59c85a36120d737f' - '2deeca538132944ce94fd774c9ef5af618731580f406cdabdfb5e360b715d4b77efd66b8163bc550133a48f84ac4231f4e7eb489dfa35f4567d36ea86124180d') -b2sums=('04fd81233647bac63a21f6a34972b18aa652d1d8ed07e1618b35372fcc6125ee43fbc80501dbcb81a1aa96b69ee372c9c1b8c61b31c3d6319b5f86f1e2a374ac' - '409359a7ad7fe3cffcb4f6de95717002137c17081e1eec78ec761421e7f9d9ab6ebecd9e6ef64c9838829176dc1f79da1e86ce22e0702bbfa2c55f14f06299ab') - -prepare() { - # fix issues with tests: https://github.com/systemd/mkosi/commit/60289499675661169cd7bfda2faf331663a43c73 - patch -Np1 -d $pkgname-$pkgver -i ../$pkgname-14-fix_tests.patch -} +sha512sums=('6959ca8096f861c5a9df3d066fdf865cd3e104130c7acccfaeb4e175b4bd4c0add77dab10f40be0001f0a3dd2412e40eb6e7740af98590ffb5a64a48b98b3a66') +b2sums=('b89c73b2f7249aec8a2274a6d99f0af73a01448cd7bfc3bf920ccf0a5ffb0664fa1054b40a02709fe0d91a7998745d8322e9444971789f8565544de480bdf6f6') build() { cd $pkgname-$pkgver python -m build --wheel --no-isolation + pandoc -t man -s -o $pkgname/resources/$pkgname.1 $pkgname/resources/$pkgname.md } check() { @@ -55,5 +64,6 @@ check() { package() { cd $pkgname-$pkgver python -m installer --destdir="$pkgdir" dist/*.whl - install -vDm 644 {NEWS,README}.md -t "$pkgdir/usr/share/doc/$pkgname/" + install -vDm 644 $pkgname/resources/$pkgname.1 -t "$pkgdir/usr/share/man/man1/" + install -vDm 644 docs/*.md {NEWS,README}.md -t "$pkgdir/usr/share/doc/$pkgname/" } View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/mkosi/-/compare/ccb2b130dff7a6953347af0715fe3583b0127b11...ae8b7bdd299dc1c252b58288d9e39a0a1e9073ae -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/mkosi/-/compare/ccb2b130dff7a6953347af0715fe3583b0127b11...ae8b7bdd299dc1c252b58288d9e39a0a1e9073ae You're receiving this email because of your account on gitlab.archlinux.org.
