upg btrfs-progs hwdata util-linux
This commit is contained in:
parent
a23e84d3c2
commit
9e3a71a9f0
8 changed files with 117 additions and 55 deletions
|
@ -6,10 +6,9 @@
|
|||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgname=btrfs-progs
|
||||
pkgver=6.1.3
|
||||
pkgver=6.2.1
|
||||
pkgrel=01
|
||||
pkgdesc='Btrfs filesystem utilities w/o systemd'
|
||||
arch=('x86_64')
|
||||
makedepends=('git' 'asciidoc' 'xmlto' 'python' 'python-setuptools' 'e2fsprogs' 'reiserfsprogs' 'python-sphinx')
|
||||
depends=('glibc' 'util-linux-libs' 'lzo' 'zlib' 'zstd' 'libgcrypt')
|
||||
optdepends=('python: libbtrfsutil python bindings'
|
||||
|
@ -63,15 +62,19 @@ package() {
|
|||
install -Dm644 initcpio-hook-btrfs "$pkgdir/usr/lib/initcpio/hooks/btrfs"
|
||||
}
|
||||
|
||||
#---- license gpg-key sha256sums ----
|
||||
#---- arch license gpg-key & sha256sums ----
|
||||
|
||||
arch=(x86_64)
|
||||
|
||||
license=('GPL2')
|
||||
|
||||
validpgpkeys=('F2B41200C54EFB30380C1756C565D5F9D76D583B')
|
||||
|
||||
sha256sums=(d37fc9ec4fa5778b20aa7548fe706eb3a300338c1473318271ae54024dac7167 # btrfs-progs-v6.1.3.tar.xz
|
||||
ff5c6ef08bda034c557abe051210e1b975a280f8d53b57003e51eff2bc82b7a7 # btrfs-progs-v6.1.3.tar.sign
|
||||
sha256sums=(af55e3104cf5e52252bb940a291ed34852916224a50206600c94134664273299 # btrfs-progs-v6.2.1.tar.xz
|
||||
048f29c59f70b1ae4625c10d00dea59b7487c576e167c18aa1eb7c50f00e22dc # btrfs-progs-v6.2.1.tar.sign
|
||||
bbe60b35d1b1e2efc1308a8f54f1fdc6808240a81c5f5b4d75321b7ee86e41f4 # initcpio-install-btrfs
|
||||
35efeee8590d6d60c711ae9cdc918e4841ab61d10cb02359e65e36ebff95ffc5) # initcpio-hook-btrfs
|
||||
|
||||
## 5020537244a274702685d0a876dd602614e7dbd47b7eb3b6bdb91a73d188b508 btrfs-progs-6.2.1-01-x86_64.pkg.tar.lz
|
||||
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
|
||||
|
||||
pkgname=btrfs-progs
|
||||
pkgver=6.1.3
|
||||
pkgver=6.2.1
|
||||
pkgrel=1
|
||||
pkgdesc='Btrfs filesystem utilities'
|
||||
arch=('x86_64')
|
||||
|
@ -27,7 +27,7 @@ source=("https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-
|
|||
install=btrfs-progs.install
|
||||
options=(!staticlibs)
|
||||
sha256sums=('SKIP'
|
||||
'd37fc9ec4fa5778b20aa7548fe706eb3a300338c1473318271ae54024dac7167'
|
||||
'af55e3104cf5e52252bb940a291ed34852916224a50206600c94134664273299'
|
||||
'bbe60b35d1b1e2efc1308a8f54f1fdc6808240a81c5f5b4d75321b7ee86e41f4'
|
||||
'35efeee8590d6d60c711ae9cdc918e4841ab61d10cb02359e65e36ebff95ffc5'
|
||||
'eaa7af92d28bfa8940bb551560fd7be777f9f175292eaa72b5f6ef00fb240252'
|
||||
|
|
|
@ -6,14 +6,13 @@
|
|||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgname=hwdata
|
||||
pkgver=0.367
|
||||
pkgver=0.368
|
||||
pkgrel=01
|
||||
pkgdesc="hardware identification databases"
|
||||
makedepends=('git')
|
||||
replaces=('hwids')
|
||||
conflicts=(hwids)
|
||||
url=https://github.com/vcrhonek/hwdata
|
||||
arch=('any')
|
||||
source=("git+https://github.com/vcrhonek/hwdata.git#tag=v${pkgver}?signed")
|
||||
|
||||
build() {
|
||||
|
@ -30,12 +29,14 @@ package() {
|
|||
|
||||
#---- license gpg-key sha256sums ----
|
||||
|
||||
arch=(x86_64)
|
||||
|
||||
license=('GPL2')
|
||||
|
||||
validpgpkeys=('3C40194FB79138CE0F78FD4919C2F062574F5403') # Vitezslav Crhonek
|
||||
|
||||
sha256sums=(SKIP)
|
||||
|
||||
# 968e30c3092d7fa9c0674990dc90f70d646b3cb43954cfe7c64c95875f46e658 hwdata-0.367-01-any.pkg.tar.lz
|
||||
## 1373b41f0e972833d812bd7b4e9821456ff8ef0b6133ba9a082a133aff89e727 hwdata-0.368-01-x86_64.pkg.tar.lz
|
||||
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
|
||||
pkgname=hwdata
|
||||
pkgver=0.367
|
||||
pkgver=0.368
|
||||
pkgrel=1
|
||||
pkgdesc="hardware identification databases"
|
||||
makedepends=('git')
|
||||
|
|
|
@ -1,4 +1,2 @@
|
|||
git
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -10,10 +10,9 @@ pkgname=(util-linux util-linux-libs)
|
|||
_pkgmajor=2.38
|
||||
_realver=${_pkgmajor}.1
|
||||
pkgver=${_realver/-/}
|
||||
pkgrel=01
|
||||
pkgrel=03
|
||||
pkgdesc='Miscellaneous system utilities for Linux w/o systemd'
|
||||
url='https://github.com/karelzak/util-linux'
|
||||
arch=('x86_64')
|
||||
makedepends=('asciidoctor' 'libcap-ng' 'libxcrypt' 'python')
|
||||
#options=('debug' 'strip')
|
||||
options=(strip)
|
||||
|
@ -30,6 +29,7 @@ source=("https://www.kernel.org/pub/linux/utils/util-linux/v${_pkgmajor}/${pkgba
|
|||
|
||||
|
||||
# --disable-raw \
|
||||
|
||||
build() {
|
||||
cd "${pkgbase}-${_realver}"
|
||||
|
||||
|
@ -57,10 +57,10 @@ package_util-linux() {
|
|||
conflicts=('rfkill' 'hardlink')
|
||||
provides=('rfkill' 'hardlink')
|
||||
replaces=('rfkill' 'hardlink')
|
||||
depends=('pam' 'shadow' 'coreutils' 'libeudev' 'libcap-ng' 'libxcrypt' 'libcrypt.so' 'util-linux-libs'
|
||||
depends=('pam' 'shadow' 'coreutils'
|
||||
'libeudev' 'libcap-ng' 'libxcrypt' 'libcrypt.so' 'util-linux-libs'
|
||||
'libmagic.so' 'libncursesw.so')
|
||||
optdepends=('python: python bindings to libmount'
|
||||
'words: default dictionary for look')
|
||||
optdepends=('words: default dictionary for look')
|
||||
backup=(etc/pam.d/chfn
|
||||
etc/pam.d/chsh
|
||||
etc/pam.d/login
|
||||
|
@ -69,23 +69,34 @@ package_util-linux() {
|
|||
etc/pam.d/su
|
||||
etc/pam.d/su-l)
|
||||
|
||||
cd "${pkgbase}-${_realver}"
|
||||
make -C "${pkgbase}-${_realver}" DESTDIR="${pkgdir}" usrsbin_execdir=/usr/bin install
|
||||
|
||||
# remove static libraries
|
||||
rm "${pkgdir}"/usr/lib/lib*.a*
|
||||
|
||||
make DESTDIR="${pkgdir}" usrsbin_execdir=/usr/bin install
|
||||
# setuid chfn and chsh
|
||||
chmod 4755 "${pkgdir}"/usr/bin/{newgrp,ch{sh,fn}}
|
||||
|
||||
# install PAM files for login-utils
|
||||
install -Dm0644 "${srcdir}/pam-common" "${pkgdir}/etc/pam.d/chfn"
|
||||
install -m0644 "${srcdir}/pam-common" "${pkgdir}/etc/pam.d/chsh"
|
||||
install -m0644 "${srcdir}/pam-login" "${pkgdir}/etc/pam.d/login"
|
||||
install -m0644 "${srcdir}/pam-runuser" "${pkgdir}/etc/pam.d/runuser"
|
||||
install -m0644 "${srcdir}/pam-runuser" "${pkgdir}/etc/pam.d/runuser-l"
|
||||
install -m0644 "${srcdir}/pam-su" "${pkgdir}/etc/pam.d/su"
|
||||
install -m0644 "${srcdir}/pam-su" "${pkgdir}/etc/pam.d/su-l"
|
||||
install -Dm0644 pam-common "${pkgdir}/etc/pam.d/chfn"
|
||||
install -m0644 pam-common "${pkgdir}/etc/pam.d/chsh"
|
||||
install -m0644 pam-login "${pkgdir}/etc/pam.d/login"
|
||||
install -m0644 pam-runuser "${pkgdir}/etc/pam.d/runuser"
|
||||
install -m0644 pam-runuser "${pkgdir}/etc/pam.d/runuser-l"
|
||||
install -m0644 pam-su "${pkgdir}/etc/pam.d/su"
|
||||
install -m0644 pam-su "${pkgdir}/etc/pam.d/su-l"
|
||||
|
||||
### runtime libs are shipped as part of util-linux-libs
|
||||
rm "${pkgdir}"/usr/lib/lib*.{a,so}*
|
||||
# TODO(dreisner): offer this upstream?
|
||||
# sed -i '/ListenStream/ aRuntimeDirectory=uuidd' "${pkgdir}/usr/lib/systemd/system/uuidd.socket"
|
||||
|
||||
# runtime libs are shipped as part of util-linux-libs
|
||||
install -d -m0755 util-linux-libs/lib/
|
||||
mv "$pkgdir"/usr/lib/lib*.so* util-linux-libs/lib/
|
||||
mv "$pkgdir"/usr/lib/pkgconfig util-linux-libs/lib/pkgconfig
|
||||
mv "$pkgdir"/usr/include util-linux-libs/include
|
||||
mv "$pkgdir"/usr/lib/python3.10/site-packages util-linux-libs/site-packages
|
||||
rmdir "$pkgdir"/usr/lib/python3.10
|
||||
mv "$pkgdir"/usr/share/man/man3 util-linux-libs/man3
|
||||
|
||||
### install sysusers
|
||||
install -Dm0644 "${srcdir}/util-linux.sysusers" \
|
||||
|
@ -93,17 +104,50 @@ package_util-linux() {
|
|||
|
||||
install -Dm0644 "${srcdir}/60-rfkill.rules" \
|
||||
"${pkgdir}/usr/lib/udev/rules.d/60-rfkill.rules"
|
||||
|
||||
# install -Dm0644 rfkill-unblock_.service \
|
||||
|
||||
# "${pkgdir}/usr/lib/systemd/system/rfkill-unblock@.service"
|
||||
# install -Dm0644 rfkill-block_.service \
|
||||
# "${pkgdir}/usr/lib/systemd/system/rfkill-block@.service"
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
package_util-linux-libs() {
|
||||
pkgdesc="util-linux runtime libraries"
|
||||
depends=('glibc')
|
||||
provides=('libutil-linux' 'libblkid.so' 'libfdisk.so' 'libmount.so' 'libsmartcols.so' 'libuuid.so')
|
||||
conflicts=('libutil-linux')
|
||||
replaces=('libutil-linux')
|
||||
make -C "${pkgbase}-${_realver}" DESTDIR="${pkgdir}" install-usrlib_execLTLIBRARIES
|
||||
optdepends=('python: python bindings to libmount')
|
||||
install -d -m0755 "$pkgdir"/usr/{lib/python3.10/,share/man/}
|
||||
mv util-linux-libs/lib/* "$pkgdir"/usr/lib/
|
||||
mv util-linux-libs/include "$pkgdir"/usr/include
|
||||
mv util-linux-libs/site-packages "$pkgdir"/usr/lib/python3.10/site-packages
|
||||
mv util-linux-libs/man3 "$pkgdir"/usr/share/man/man3
|
||||
|
||||
}
|
||||
|
||||
#---- license gpg-key sha256sums ----
|
||||
#---- arch license gpg-key & sha256sums ----
|
||||
|
||||
arch=(x86_64)
|
||||
|
||||
license=('GPL2')
|
||||
|
||||
|
@ -118,3 +162,6 @@ sha256sums=(60492a19b44e6cf9a3ddff68325b333b8b52b6c59ce3ebd6a0ecaa4c5117e84f # u
|
|||
10b0505351263a099163c0d928132706e501dd0a008dac2835b052167b14abe3 # util-linux.sysusers
|
||||
7423aaaa09fee7f47baa83df9ea6fef525ff9aec395c8cbd9fe848ceb2643f37) # 60-rfkill.rules
|
||||
|
||||
## 11c802f75ee223e5565844c2480fa65c5abec686744330ae032afb90aeb610bd util-linux-2.38.1-03-x86_64.pkg.tar.lz
|
||||
## 8f069ce441cb62a4c96764110c25312d968e18e7f17872aca11717869ed35ff3 util-linux-libs-2.38.1-03-x86_64.pkg.tar.lz
|
||||
|
||||
|
|
|
@ -7,13 +7,13 @@ pkgname=(util-linux util-linux-libs)
|
|||
_pkgmajor=2.38
|
||||
_realver=${_pkgmajor}.1
|
||||
pkgver=${_realver/-/}
|
||||
pkgrel=1
|
||||
pkgrel=3
|
||||
pkgdesc='Miscellaneous system utilities for Linux'
|
||||
url='https://github.com/karelzak/util-linux'
|
||||
arch=('x86_64')
|
||||
makedepends=('asciidoctor' 'libcap-ng' 'libxcrypt' 'python' 'systemd')
|
||||
license=('GPL2')
|
||||
options=('debug' 'strip')
|
||||
options=('strip')
|
||||
validpgpkeys=('B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284') # Karel Zak
|
||||
source=("https://www.kernel.org/pub/linux/utils/util-linux/v${_pkgmajor}/${pkgbase}-${_realver}.tar."{xz,sign}
|
||||
pam-{login,common,runuser,su}
|
||||
|
@ -60,8 +60,7 @@ package_util-linux() {
|
|||
depends=('pam' 'shadow' 'coreutils' 'systemd-libs' 'libsystemd.so'
|
||||
'libudev.so' 'libcap-ng' 'libxcrypt' 'libcrypt.so' 'util-linux-libs'
|
||||
'libmagic.so' 'libncursesw.so')
|
||||
optdepends=('python: python bindings to libmount'
|
||||
'words: default dictionary for look')
|
||||
optdepends=('words: default dictionary for look')
|
||||
backup=(etc/pam.d/chfn
|
||||
etc/pam.d/chsh
|
||||
etc/pam.d/login
|
||||
|
@ -70,46 +69,59 @@ package_util-linux() {
|
|||
etc/pam.d/su
|
||||
etc/pam.d/su-l)
|
||||
|
||||
cd "${pkgbase}-${_realver}"
|
||||
make -C "${pkgbase}-${_realver}" DESTDIR="${pkgdir}" usrsbin_execdir=/usr/bin install
|
||||
|
||||
make DESTDIR="${pkgdir}" usrsbin_execdir=/usr/bin install
|
||||
# remove static libraries
|
||||
rm "${pkgdir}"/usr/lib/lib*.a*
|
||||
|
||||
# setuid chfn and chsh
|
||||
chmod 4755 "${pkgdir}"/usr/bin/{newgrp,ch{sh,fn}}
|
||||
|
||||
# install PAM files for login-utils
|
||||
install -Dm0644 "${srcdir}/pam-common" "${pkgdir}/etc/pam.d/chfn"
|
||||
install -m0644 "${srcdir}/pam-common" "${pkgdir}/etc/pam.d/chsh"
|
||||
install -m0644 "${srcdir}/pam-login" "${pkgdir}/etc/pam.d/login"
|
||||
install -m0644 "${srcdir}/pam-runuser" "${pkgdir}/etc/pam.d/runuser"
|
||||
install -m0644 "${srcdir}/pam-runuser" "${pkgdir}/etc/pam.d/runuser-l"
|
||||
install -m0644 "${srcdir}/pam-su" "${pkgdir}/etc/pam.d/su"
|
||||
install -m0644 "${srcdir}/pam-su" "${pkgdir}/etc/pam.d/su-l"
|
||||
install -Dm0644 pam-common "${pkgdir}/etc/pam.d/chfn"
|
||||
install -m0644 pam-common "${pkgdir}/etc/pam.d/chsh"
|
||||
install -m0644 pam-login "${pkgdir}/etc/pam.d/login"
|
||||
install -m0644 pam-runuser "${pkgdir}/etc/pam.d/runuser"
|
||||
install -m0644 pam-runuser "${pkgdir}/etc/pam.d/runuser-l"
|
||||
install -m0644 pam-su "${pkgdir}/etc/pam.d/su"
|
||||
install -m0644 pam-su "${pkgdir}/etc/pam.d/su-l"
|
||||
|
||||
# TODO(dreisner): offer this upstream?
|
||||
sed -i '/ListenStream/ aRuntimeDirectory=uuidd' "${pkgdir}/usr/lib/systemd/system/uuidd.socket"
|
||||
|
||||
### runtime libs are shipped as part of util-linux-libs
|
||||
rm "${pkgdir}"/usr/lib/lib*.{a,so}*
|
||||
# runtime libs are shipped as part of util-linux-libs
|
||||
install -d -m0755 util-linux-libs/lib/
|
||||
mv "$pkgdir"/usr/lib/lib*.so* util-linux-libs/lib/
|
||||
mv "$pkgdir"/usr/lib/pkgconfig util-linux-libs/lib/pkgconfig
|
||||
mv "$pkgdir"/usr/include util-linux-libs/include
|
||||
mv "$pkgdir"/usr/lib/python3.10/site-packages util-linux-libs/site-packages
|
||||
rmdir "$pkgdir"/usr/lib/python3.10
|
||||
mv "$pkgdir"/usr/share/man/man3 util-linux-libs/man3
|
||||
|
||||
### install systemd-sysusers
|
||||
install -Dm0644 "${srcdir}/util-linux.sysusers" \
|
||||
# install systemd-sysusers
|
||||
install -Dm0644 util-linux.sysusers \
|
||||
"${pkgdir}/usr/lib/sysusers.d/util-linux.conf"
|
||||
|
||||
install -Dm0644 "${srcdir}/60-rfkill.rules" \
|
||||
install -Dm0644 60-rfkill.rules \
|
||||
"${pkgdir}/usr/lib/udev/rules.d/60-rfkill.rules"
|
||||
|
||||
install -Dm0644 "${srcdir}/rfkill-unblock_.service" \
|
||||
install -Dm0644 rfkill-unblock_.service \
|
||||
"${pkgdir}/usr/lib/systemd/system/rfkill-unblock@.service"
|
||||
install -Dm0644 "${srcdir}/rfkill-block_.service" \
|
||||
install -Dm0644 rfkill-block_.service \
|
||||
"${pkgdir}/usr/lib/systemd/system/rfkill-block@.service"
|
||||
}
|
||||
|
||||
package_util-linux-libs() {
|
||||
pkgdesc="util-linux runtime libraries"
|
||||
depends=('glibc')
|
||||
provides=('libutil-linux' 'libblkid.so' 'libfdisk.so' 'libmount.so' 'libsmartcols.so' 'libuuid.so')
|
||||
conflicts=('libutil-linux')
|
||||
replaces=('libutil-linux')
|
||||
optdepends=('python: python bindings to libmount')
|
||||
|
||||
make -C "${pkgbase}-${_realver}" DESTDIR="${pkgdir}" install-usrlib_execLTLIBRARIES
|
||||
install -d -m0755 "$pkgdir"/usr/{lib/python3.10/,share/man/}
|
||||
mv util-linux-libs/lib/* "$pkgdir"/usr/lib/
|
||||
mv util-linux-libs/include "$pkgdir"/usr/include
|
||||
mv util-linux-libs/site-packages "$pkgdir"/usr/lib/python3.10/site-packages
|
||||
mv util-linux-libs/man3 "$pkgdir"/usr/share/man/man3
|
||||
}
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
|
||||
real 2m42.323s
|
||||
user 2m32.256s
|
||||
sys 0m15.060s
|
||||
|
||||
real 3m1.023s
|
||||
user 2m34.134s
|
||||
sys 0m15.811s
|
||||
|
||||
|
|
Loading…
Reference in a new issue