upg mastodon mdadm-git
This commit is contained in:
parent
3e7b86188b
commit
2096940299
5 changed files with 28 additions and 72 deletions
|
|
@ -6,8 +6,8 @@
|
|||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgname=mastodon
|
||||
pkgver=4.2.3
|
||||
pkgrel=03
|
||||
pkgver=4.2.8
|
||||
pkgrel=02
|
||||
pkgdesc='Your self-hosted, globally interconnected microblogging community w/o systemd'
|
||||
url=https://github.com/mastodon/mastodon
|
||||
depends=(ffmpeg gcc git imagemagick libidn libpqxx libxml2 libxslt libyaml make
|
||||
|
|
@ -60,11 +60,10 @@ arch=(x86_64)
|
|||
|
||||
license=(AGPL3)
|
||||
|
||||
sha256sums=(328ced93a073e775c355956ea298f5796be5af7f584442fdd8e65190117c631f # v4.2.3.tar.gz
|
||||
sha256sums=(ccecdfaab5f84cfaeb193eff2b7b795f7bdd08aa872e265dcb2625310f2c9478 # v4.2.8.tar.gz
|
||||
51eb41e5126683f08244e461bbef04b40f02b6772bbfe6a91f60f5480af60c3b # mastodon.target
|
||||
1b67693f7de5802a34985b9ac969497fc6e6042dcae0b8abf6595b9fe15ee80e # mastodon.sysusers.d
|
||||
3fdd54dd1f374b7206c8beaebafdf890e74d30385f0c93f9cd99e1e4be92f8fa) # mastodon.tmpfiles.d
|
||||
|
||||
## ef2f1ab99bf15d7a660dc65baf86acf8d48d93e388d1c2a26b3418e26761b3c7 mastodon.install
|
||||
## 01205759e4e3f2f12a14f54251eb87eb9d3619ee6b1e686b4b05037ae98284b1 mastodon-4.2.8-02-x86_64.pkg.tar.lz
|
||||
|
||||
## cce52690197385a0c4e931ba83a4d75fc00cf4358b93d92cbc89e80d7fe31e0f mastodon-4.2.3-03-x86_64.pkg.tar.lz
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@
|
|||
# Contributor: Fredrick Brennan <copypaste@kittens.ph>
|
||||
|
||||
pkgname=mastodon
|
||||
pkgver=4.2.3
|
||||
pkgrel=2
|
||||
pkgver=4.2.8
|
||||
pkgrel=1
|
||||
pkgdesc='Your self-hosted, globally interconnected microblogging community'
|
||||
arch=(any)
|
||||
url=https://github.com/mastodon/mastodon
|
||||
|
|
@ -36,7 +36,7 @@ source=(https://github.com/mastodon/mastodon/archive/v$pkgver.tar.gz
|
|||
mastodon.target
|
||||
mastodon.sysusers.d
|
||||
mastodon.tmpfiles.d)
|
||||
sha512sums=('65cbd5b586e189931d7c007c227f553ebbfa30f051443a3fff334260bd66751b0b583495b4add677eb66da0332e7943d30fb23944c0ad6af1af37598c337e41f'
|
||||
sha512sums=('c48a04df9c59518f7325b8119bf943436e29ccbfaecff3f7b96162e77fa2012df3f5d4e92e209e233ca7c4646205f5e34bf5f7d22b973115b8e16b3b5ada1fb0'
|
||||
'c9820c2a83d08bd5d842a78e924682db97ebd5c7291b682603ad30dafcdcc5816c13e717ad39554f042b9d9ed71ab902ce3f604952264a900a72612ee8060acb'
|
||||
'4ee4210bde391e6dc782cb7c14f2cb968c95ad541aa0efcf843a811f8cc5f0d1067ee3c8346bb412aa9fd1dd5a8bd05a4524df7dc4a106957009853dd237074a'
|
||||
'27c4eb01d462c525b59e5808a3b2501b63a34425752128388fbde82f7eb5944b20d2f8d8b1be8ed8adb165cab4cfb8e13f90215f20989ca671a0422ffa37001f')
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
pkgname='mdadm-git'
|
||||
_pkgname='mdadm'
|
||||
pkgver=4.2.r173.g3f22931f
|
||||
pkgver=4.3.r19.g3aa5bb0a
|
||||
pkgrel=02
|
||||
pkgdesc='A tool for managing/monitoring Linux md device arrays, also known as Software RAID w/o systemd '
|
||||
#url='https://github.com/neilbrown/mdadm'
|
||||
|
|
@ -15,14 +15,12 @@ pkgdesc='A tool for managing/monitoring Linux md device arrays, also known as So
|
|||
url='https://git.kernel.org/pub/scm/utils/mdadm'
|
||||
makedepends=('git')
|
||||
depends=('glibc')
|
||||
#depends+=('mkinitcpio>=0.7')
|
||||
optdepends=('bash: mdcheck')
|
||||
#optdepends+=('lvm2' 'dm-crypt' 'bcache')
|
||||
conflicts=('mkinitcpio<38' "${_pkgname}")
|
||||
provides=("${_pkgname}=${pkgver%.r*}")
|
||||
conflicts=("${_pkgname}")
|
||||
replaces=('raidtools')
|
||||
backup=("etc/${_pkgname}.conf")
|
||||
install="${_pkgname}.install"
|
||||
optdepends=('bash: mdcheck')
|
||||
#install="${_pkgname}.install"
|
||||
_verwatch=('https://mirrors.edge.kernel.org/pub/linux/utils/raid/mdadm/' 'mdadm-\(.*\)\.tar\.xz' 't')
|
||||
#_archlink="@@@::https://projects.archlinux.org/svntogit/packages.git/plain/trunk/@@@?h=packages/${_pkgname}"
|
||||
_archlink="@@@::https://gitlab.archlinux.org/archlinux/packaging/packages/${_pkgname}"
|
||||
|
|
@ -32,11 +30,11 @@ source=(
|
|||
#"mdadm_github::git+https://github.com/neilbrown/${_pkgname}.git"
|
||||
"mdadm_gitkr::git://git.kernel.org/pub/scm/utils/mdadm/mdadm.git"
|
||||
# '0000-mdadm-no-build-on-install-test.patch'
|
||||
"${_archlink//@@@/${_pkgname}.conf}"
|
||||
"${_pkgname}.conf")
|
||||
# "${_archlink//@@@/${_pkgname}_udev_install}"
|
||||
# "${_archlink//@@@/${_pkgname}_udev_hook}")
|
||||
"${_pkgname}_udev_install"
|
||||
"${_pkgname}_udev_hook")
|
||||
# "${_pkgname}_udev_install"
|
||||
# "${_pkgname}_udev_hook")
|
||||
|
||||
pkgver() {
|
||||
cd mdadm_git*/
|
||||
|
|
@ -46,8 +44,8 @@ pkgver() {
|
|||
prepare() {
|
||||
cd mdadm_git*/
|
||||
# NB and the mdadm team strive for warning free code. Disable the warning only when necessary.
|
||||
sed -e 's: -Werror : :g' -i 'Makefile' # disable-werror.patch
|
||||
sed -e 's:/usr/sbin/:/usr/bin:g' -e 's:/sbin:/usr/bin:g' -i $(grep -lrce '/sbin/' .)
|
||||
# sed -e 's: -Werror : :g' -i 'Makefile' # disable-werror.patch
|
||||
# sed -e 's:/usr/sbin/:/usr/bin:g' -e 's:/sbin:/usr/bin:g' -i $(grep -lrce '/sbin/' .)
|
||||
|
||||
# make install test must not compile anything
|
||||
#f="${PWD##*/}"; cd ..; ln -sr "${f}" 'b'; cp -pr "${f}" a/; false
|
||||
|
|
@ -58,7 +56,8 @@ prepare() {
|
|||
|
||||
build() {
|
||||
cd mdadm_git*/
|
||||
nice make -s CXFLAGS="${CFLAGS}" BINDIR='/usr/bin' UDEVDIR='/usr/lib/udev'
|
||||
|
||||
nice make -s CXFLAGS="$CFLAGS" BINDIR=/usr/bin UDEVDIR=/usr/lib/udev
|
||||
}
|
||||
|
||||
check() {
|
||||
|
|
@ -75,73 +74,28 @@ check() {
|
|||
|
||||
package() {
|
||||
cd mdadm_git*/
|
||||
make -s -j1 INSTALL='/usr/bin/install' BINDIR='/usr/bin' DESTDIR="${pkgdir}" UDEVDIR='/usr/lib/udev' install
|
||||
make -s -j1 INSTALL=/usr/bin/install BINDIR=/usr/bin DESTDIR="$pkgdir" UDEVDIR=/usr/lib/udev install
|
||||
|
||||
# systemd addon
|
||||
# # systemd addon
|
||||
# make -s -j1 SYSTEMD_DIR="${pkgdir}/usr/lib/systemd/system" install-systemd # does not honor silent -s
|
||||
# sed -e 's:#!/bin/sh:#!/usr/bin/sh:g' -i "${pkgdir}/usr/lib/systemd/system-shutdown/mdadm.shutdown"
|
||||
|
||||
# configuration
|
||||
install -Dpm644 "${srcdir}/mdadm.conf" -t "${pkgdir}/etc/"
|
||||
sed -e 's:/usr/sbin/:/usr/bin/:g' -i "${pkgdir}/etc/mdadm.conf"
|
||||
|
||||
# hook mdadm_udev
|
||||
install -Dpm644 "${srcdir}/mdadm_udev_install" "${pkgdir}/usr/lib/initcpio/install/mdadm_udev"
|
||||
if ! grep -q 'add_runscript' "${pkgdir}/usr/lib/initcpio/install/mdadm_udev"; then
|
||||
sed -e 's:^\(\s\+\)add_binary:\1add_runscript\n&:g' -i "${pkgdir}/usr/lib/initcpio/install/mdadm_udev"
|
||||
fi
|
||||
sed -e 's:#!/bin/bash:#!/usr/bin/bash:g' -i "${pkgdir}/usr/lib/initcpio/install/mdadm_udev"
|
||||
bash -n "${pkgdir}/usr/lib/initcpio/install/mdadm_udev" || echo "${}"
|
||||
ln -s '/usr/lib/initcpio/install/mdadm_udev' "${pkgdir}/usr/lib/initcpio/install/mdadm"
|
||||
|
||||
# Custom display hook
|
||||
install -Dpm644 "${srcdir}/mdadm_udev_hook" "${pkgdir}/usr/lib/initcpio/hooks/mdadm_udev"
|
||||
bash -n "${pkgdir}/usr/lib/initcpio/hooks/mdadm_udev" || echo "${}"
|
||||
#ln -sf 'mdadm' "${pkgdir}/usr/lib/initcpio/hooks/raid" # symlink for backward compatibility
|
||||
|
||||
# Ensure all udev rules files are present in the initcpio install hooks
|
||||
shopt -s failglob
|
||||
local _lf=$'\n'
|
||||
local _missing=''
|
||||
pushd "${pkgdir}" > /dev/null
|
||||
local _mks=(usr/lib/initcpio/install/*)
|
||||
cd "${pkgdir}/usr/lib/udev/rules.d/"
|
||||
local _mk _mkd _ud _udp
|
||||
for _mk in "${_mks[@]}"; do
|
||||
for _ud in *.rules; do
|
||||
_udp="/usr/lib/udev/rules.d/${_ud}"
|
||||
if ! grep -qe "add_file.*${_udp}" "${pkgdir}/${_mk}"; then
|
||||
_missing+="${_lf}Missing ${_mk}: ${_udp}"
|
||||
fi
|
||||
done
|
||||
done
|
||||
popd > /dev/null
|
||||
if [ ! -z "${_missing}" ]; then
|
||||
echo "${_missing}"
|
||||
|
||||
# Disable for now.
|
||||
: false
|
||||
fi
|
||||
shopt -u failglob
|
||||
|
||||
# Ensure files are clean
|
||||
! grep -alqr "mdassemble" "${pkgdir}" || { echo "Line ${LINENO} Forbidden: mdassemble"; false; }
|
||||
! grep -alqr "/sbin" "${pkgdir}" || echo "${}"
|
||||
install -D -m755 misc/mdcheck "$pkgdir"/usr/share/mdadm/mdcheck
|
||||
}
|
||||
|
||||
#---- arch license gpg-key & sha256sums ----
|
||||
|
||||
arch=(x86_64)
|
||||
|
||||
license=('GPL')
|
||||
license=('GPL-2.0-or-later')
|
||||
|
||||
#validpgpkeys=('6A86B80E1D22F21D0B26BA75397D82E0531A9C91') # Jes Sorensen
|
||||
|
||||
sha256sums=(SKIP # mdadm_gitkr
|
||||
## 18f4ab16e9f4aed84d40456f6125fbb54447d0d0679d9b290355ff3acf8319a8 # 0000-mdadm-no-build-on-install-test.patch
|
||||
4ce1e90690282f98e4828e11576fbd61be65e97a2cdae6c7eac7035ea5ee53e5 # mdadm.conf
|
||||
b6782029bdae2d7f87ea0e332bb90f72a7792e933580e37602e81e2f1bb82a9c # mdadm_udev_install
|
||||
d395184617f45849cbbaf5b4ee3665ca6895a1d642e0470e9de703ce944279ca) # mdadm_udev_hook
|
||||
d2d64fc4ab823b347f7fea7fa0326aa7edb6dcdf6e987a53856b07178ad0886e) # mdadm.conf
|
||||
|
||||
## b73e67a739d630aea677174711b4b64c6c718ea2c9c860a55c1f5f6a0ac3c4e4 mdadm-git-4.2.r173.g3f22931f-02-x86_64.pkg.tar.lz
|
||||
## fd4e32ee2162996d3fe05d6439b9d1f88ecbe5a428452f45ca00bb9ff731c362 mdadm-git-4.3.r19.g3aa5bb0a-02-x86_64.pkg.tar.lz
|
||||
|
||||
|
|
|
|||
3
mdadm-git/key
Normal file
3
mdadm-git/key
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
gpg -v --recv-key 397D82E0531A9C91
|
||||
gpg -v --recv-key 6F9E3E9D4EDEBB11
|
||||
|
||||
|
|
@ -60,7 +60,7 @@ DEVICE partitions
|
|||
|
||||
# When used in --follow (aka --monitor) mode, mdadm needs a
|
||||
# mail address and/or a program. To start mdadm's monitor mode, enable
|
||||
# mdadm.service in systemd.
|
||||
# mdadm.service.
|
||||
#
|
||||
# If the lines are not found, mdadm will exit quietly
|
||||
#MAILADDR root@mydomain.tld
|
||||
|
|
|
|||
Loading…
Reference in a new issue