upg cryptsetup lvm2 mkinitcpio
This commit is contained in:
parent
0ecc8ea0b4
commit
0580177278
6 changed files with 47 additions and 51 deletions
|
@ -7,7 +7,7 @@
|
|||
|
||||
pkgname=cryptsetup
|
||||
pkgver=2.7.0
|
||||
pkgrel=01
|
||||
pkgrel=03
|
||||
pkgdesc='Userspace setup tool for transparent encryption of block devices using dm-crypt w/o systemd'
|
||||
url='https://gitlab.com/cryptsetup/cryptsetup/'
|
||||
depends=('device-mapper' 'libdevmapper.so' 'openssl' 'popt' 'util-linux-libs'
|
||||
|
@ -15,10 +15,11 @@ depends=('device-mapper' 'libdevmapper.so' 'openssl' 'popt' 'util-linux-libs'
|
|||
makedepends=(util-linux asciidoctor)
|
||||
provides=('libcryptsetup.so')
|
||||
#options=('debug' '!emptydirs')
|
||||
conflicts=('mkinitcpio<38-1')
|
||||
options=('!emptydirs')
|
||||
source=("https://www.kernel.org/pub/linux/utils/cryptsetup/v${pkgver%.*}/${pkgname}-${pkgver}.tar."{xz,sign}
|
||||
'hooks-encrypt'
|
||||
'install-encrypt')
|
||||
source=("https://www.kernel.org/pub/linux/utils/cryptsetup/v${pkgver%.*}/${pkgname}-${pkgver}.tar."{xz,sign})
|
||||
# 'hooks-encrypt'
|
||||
# 'install-encrypt')
|
||||
# systemd-crap
|
||||
# 'install-sd-encrypt')
|
||||
|
||||
|
@ -42,10 +43,10 @@ package() {
|
|||
|
||||
# install docs
|
||||
install -D -m0644 -t "${pkgdir}"/usr/share/doc/cryptsetup/ FAQ.md docs/{Keyring,LUKS2-locking}.txt
|
||||
# install hook
|
||||
install -D -m0644 "${srcdir}"/hooks-encrypt "${pkgdir}"/usr/lib/initcpio/hooks/encrypt
|
||||
install -D -m0644 "${srcdir}"/install-encrypt "${pkgdir}"/usr/lib/initcpio/install/encrypt
|
||||
# install -D -m0644 "${srcdir}"/install-sd-encrypt "${pkgdir}"/usr/lib/initcpio/install/sd-encrypt
|
||||
# # install hook
|
||||
# install -D -m0644 "${srcdir}"/hooks-encrypt "${pkgdir}"/usr/lib/initcpio/hooks/encrypt
|
||||
# install -D -m0644 "${srcdir}"/install-encrypt "${pkgdir}"/usr/lib/initcpio/install/encrypt
|
||||
## install -D -m0644 "${srcdir}"/install-sd-encrypt "${pkgdir}"/usr/lib/initcpio/install/sd-encrypt
|
||||
}
|
||||
|
||||
#---- arch license gpg-key & sha256sums ----
|
||||
|
@ -57,11 +58,11 @@ license=('GPL')
|
|||
validpgpkeys=('2A2918243FDE46648D0686F9D9B0577BD93E98FC') # Milan Broz <gmazyland@gmail.com>
|
||||
|
||||
sha256sums=(94003a00cd5a81944f45e8dc529e0cfd2a6ff629bd2cd21cf5e574e465daf795 # cryptsetup-2.7.0.tar.xz
|
||||
ae18d1ebe90f38d93cee9af7a05acacb61ed60adffc9180c76c61afba445497f # cryptsetup-2.7.0.tar.sign
|
||||
839e961e053512293052250b424f38c347cb46c14cbd51d7e2705b3f5378ec02 # hooks-encrypt
|
||||
2b71c6c56ef81e5bf4f49dcc08dbd1651b46bda51a8f75a0a342b344b2d0eccd) # install-encrypt
|
||||
ae18d1ebe90f38d93cee9af7a05acacb61ed60adffc9180c76c61afba445497f) # cryptsetup-2.7.0.tar.sign
|
||||
# 839e961e053512293052250b424f38c347cb46c14cbd51d7e2705b3f5378ec02 # hooks-encrypt
|
||||
# 2b71c6c56ef81e5bf4f49dcc08dbd1651b46bda51a8f75a0a342b344b2d0eccd) # install-encrypt
|
||||
# systemd-crap
|
||||
# 90cb28135734c5888a65dc35b345552f31328f04d6a8c3c312c41194f06026c9) # install-sd-encrypt
|
||||
|
||||
## 14f004a0f21ecf8a01a56ef964f2fa9a750bd5223b8b2ff43d808736b886d22d cryptsetup-2.7.0-01-x86_64.pkg.tar.lz
|
||||
## bc4f35af5d01c404d0fdde8e8fc8271d48515f4b1cbaf100953140146a95566e cryptsetup-2.7.0-03-x86_64.pkg.tar.lz
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
pkgname=cryptsetup
|
||||
pkgver=2.7.0
|
||||
pkgrel=1
|
||||
pkgrel=3
|
||||
pkgdesc='Userspace setup tool for transparent encryption of block devices using dm-crypt'
|
||||
arch=(x86_64)
|
||||
license=('GPL')
|
||||
|
@ -11,18 +11,13 @@ url='https://gitlab.com/cryptsetup/cryptsetup/'
|
|||
depends=('device-mapper' 'libdevmapper.so' 'openssl' 'popt' 'util-linux-libs'
|
||||
'libuuid.so' 'json-c' 'libjson-c.so' 'argon2' 'libargon2.so')
|
||||
makedepends=('util-linux' 'asciidoctor')
|
||||
conflicts=('mkinitcpio<38-1')
|
||||
provides=('libcryptsetup.so')
|
||||
options=('!emptydirs')
|
||||
validpgpkeys=('2A2918243FDE46648D0686F9D9B0577BD93E98FC') # Milan Broz <gmazyland@gmail.com>
|
||||
source=("https://www.kernel.org/pub/linux/utils/cryptsetup/v${pkgver%.*}/${pkgname}-${pkgver}.tar."{xz,sign}
|
||||
'hooks-encrypt'
|
||||
'install-encrypt'
|
||||
'install-sd-encrypt')
|
||||
source=("https://www.kernel.org/pub/linux/utils/cryptsetup/v${pkgver%.*}/${pkgname}-${pkgver}.tar."{xz,sign})
|
||||
sha256sums=('94003a00cd5a81944f45e8dc529e0cfd2a6ff629bd2cd21cf5e574e465daf795'
|
||||
'SKIP'
|
||||
'839e961e053512293052250b424f38c347cb46c14cbd51d7e2705b3f5378ec02'
|
||||
'2b71c6c56ef81e5bf4f49dcc08dbd1651b46bda51a8f75a0a342b344b2d0eccd'
|
||||
'90cb28135734c5888a65dc35b345552f31328f04d6a8c3c312c41194f06026c9')
|
||||
'SKIP')
|
||||
|
||||
build() {
|
||||
cd "${srcdir}"/$pkgname-${pkgver}
|
||||
|
@ -44,9 +39,4 @@ package() {
|
|||
|
||||
# install docs
|
||||
install -D -m0644 -t "${pkgdir}"/usr/share/doc/cryptsetup/ FAQ.md docs/{Keyring,LUKS2-locking}.txt
|
||||
|
||||
# install hook
|
||||
install -D -m0644 "${srcdir}"/hooks-encrypt "${pkgdir}"/usr/lib/initcpio/hooks/encrypt
|
||||
install -D -m0644 "${srcdir}"/install-encrypt "${pkgdir}"/usr/lib/initcpio/install/encrypt
|
||||
install -D -m0644 "${srcdir}"/install-sd-encrypt "${pkgdir}"/usr/lib/initcpio/install/sd-encrypt
|
||||
}
|
||||
|
|
|
@ -11,14 +11,14 @@ pkgname=('lvm2' 'device-mapper')
|
|||
# latest release does not have a tag... :-\
|
||||
_commit='d786a8f820d54ce87a919e6af5426c333c173b11'
|
||||
pkgver=2.03.23
|
||||
pkgrel=01
|
||||
pkgrel=03
|
||||
url='https://sourceware.org/lvm2/'
|
||||
makedepends=('git' 'libaio' 'thin-provisioning-tools')
|
||||
#options=('!makeflags')
|
||||
#source=("git+https://sourceware.org/git/lvm2.git#tag=${_tag}?signed"
|
||||
source=("git+https://sourceware.org/git/lvm2.git#commit=${_commit}"
|
||||
'0001-udev-initcpio.patch'
|
||||
'lvm2_install'
|
||||
# 'lvm2_install'
|
||||
'11-dm-initramfs.rules')
|
||||
|
||||
#_backports=(
|
||||
|
@ -109,7 +109,7 @@ package_lvm2() {
|
|||
depends=('bash' "device-mapper>=${pkgver}"
|
||||
'libudev.so' 'util-linux-libs' 'libblkid.so' 'readline' 'libreadline.so'
|
||||
'thin-provisioning-tools' 'libaio' 'libaio.so')
|
||||
conflicts=('lvm' 'mkinitcpio<0.7')
|
||||
conflicts=('lvm' 'mkinitcpio<38')
|
||||
backup=('etc/lvm/lvm.conf'
|
||||
'etc/lvm/lvmlocal.conf')
|
||||
|
||||
|
@ -118,9 +118,9 @@ package_lvm2() {
|
|||
make DESTDIR="${pkgdir}" install_lvm2
|
||||
# /etc directories
|
||||
install -d "${pkgdir}"/etc/lvm/{archive,backup}
|
||||
# mkinitcpio hook
|
||||
install -D -m0644 "${srcdir}/lvm2_install" "${pkgdir}/usr/lib/initcpio/install/lvm2"
|
||||
ln -s lvm2 "${pkgdir}/usr/lib/initcpio/install/sd-lvm2"
|
||||
# # mkinitcpio hook
|
||||
# install -D -m0644 "${srcdir}/lvm2_install" "${pkgdir}/usr/lib/initcpio/install/lvm2"
|
||||
# ln -s lvm2 "${pkgdir}/usr/lib/initcpio/install/sd-lvm2"
|
||||
# extra udev rule for non-systemd initramfs
|
||||
install -D -m0644 udev/69-dm-lvm-initcpio.rules "${pkgdir}/usr/lib/initcpio/udev/69-dm-lvm.rules"
|
||||
|
||||
|
@ -137,9 +137,8 @@ validpgpkeys=('88437EF5C077BD113D3B7224228191C1567E2C17' # Alasdair G Kergon <a
|
|||
|
||||
sha256sums=(SKIP
|
||||
2b3a16ec05e2bc6678e9ebd5ffa8319ebfde29aa260ce004f79f9b8df57d73c9 # 0001-udev-initcpio.patch
|
||||
def6e03aa1629bbc0ca1ee5e84e620366daf779f037eab2fda47487a8471729b # lvm2_install
|
||||
# def6e03aa1629bbc0ca1ee5e84e620366daf779f037eab2fda47487a8471729b # lvm2_install
|
||||
e10f24b57582d6e2da71f7c80732a62e0ee2e3b867fe84591ccdb53e80fa92e0) # 11-dm-initramfs.rules
|
||||
|
||||
## 2af720ce3a520e811b62d79af53a198d9332da7dba9d36079cd61317d3ea0ae2 device-mapper-2.03.23-01-x86_64.pkg.tar.lz
|
||||
## 388a4fbece4afea1b6746b1588fe61a0bec79f2573c9ddac680236e29b4491dd lvm2-2.03.23-01-x86_64.pkg.tar.lz
|
||||
|
||||
## ce9032426fe6d423af4bc9fda607be2c5fffdc959aafd9f278c347607182ff42 device-mapper-2.03.23-03-x86_64.pkg.tar.lz
|
||||
## 62a66749d4e3ec30d88ad36a4c72f7597b392a9357a62a6e511797cd7ef74040 lvm2-2.03.23-03-x86_64.pkg.tar.lz
|
||||
|
|
|
@ -7,7 +7,7 @@ pkgname=('lvm2' 'device-mapper')
|
|||
# latest release does not have a tag... :-\
|
||||
_commit='d786a8f820d54ce87a919e6af5426c333c173b11'
|
||||
pkgver=2.03.23
|
||||
pkgrel=1
|
||||
pkgrel=3
|
||||
arch=('x86_64')
|
||||
url='https://sourceware.org/lvm2/'
|
||||
license=('GPL2' 'LGPL2.1')
|
||||
|
@ -16,11 +16,9 @@ validpgpkeys=('88437EF5C077BD113D3B7224228191C1567E2C17' # Alasdair G Kergon <a
|
|||
'D501A478440AE2FD130A1BE8B9112431E509039F') # Marian Csontos <marian.csontos@gmail.com>
|
||||
source=("git+https://sourceware.org/git/lvm2.git#commit=${_commit}"
|
||||
'0001-udev-initcpio.patch'
|
||||
'lvm2_install'
|
||||
'11-dm-initramfs.rules')
|
||||
sha256sums=('SKIP'
|
||||
'2b3a16ec05e2bc6678e9ebd5ffa8319ebfde29aa260ce004f79f9b8df57d73c9'
|
||||
'8870091ef70b5ea18b18bfcc770f8bda7dcd9d7cc2cc4fe5e4c3ac1f35bbb66a'
|
||||
'e10f24b57582d6e2da71f7c80732a62e0ee2e3b867fe84591ccdb53e80fa92e0')
|
||||
|
||||
_backports=(
|
||||
|
@ -105,7 +103,7 @@ package_lvm2() {
|
|||
depends=('bash' "device-mapper>=${pkgver}" 'systemd-libs'
|
||||
'libudev.so' 'util-linux-libs' 'libblkid.so' 'readline' 'libreadline.so'
|
||||
'thin-provisioning-tools' 'libaio' 'libaio.so')
|
||||
conflicts=('lvm' 'mkinitcpio<0.7')
|
||||
conflicts=('lvm' 'mkinitcpio<38-1')
|
||||
backup=('etc/lvm/lvm.conf'
|
||||
'etc/lvm/lvmlocal.conf')
|
||||
|
||||
|
@ -114,9 +112,6 @@ package_lvm2() {
|
|||
make DESTDIR="${pkgdir}" install_lvm2
|
||||
# /etc directories
|
||||
install -d "${pkgdir}"/etc/lvm/{archive,backup}
|
||||
# mkinitcpio hook
|
||||
install -D -m0644 "${srcdir}/lvm2_install" "${pkgdir}/usr/lib/initcpio/install/lvm2"
|
||||
ln -s lvm2 "${pkgdir}/usr/lib/initcpio/install/sd-lvm2"
|
||||
# extra udev rule for non-systemd initramfs
|
||||
install -D -m0644 udev/69-dm-lvm-initcpio.rules "${pkgdir}/usr/lib/initcpio/udev/69-dm-lvm.rules"
|
||||
# systemd support
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgname=mkinitcpio
|
||||
pkgver=37.3
|
||||
pkgver=38
|
||||
pkgrel=01
|
||||
pkgdesc="Modular initramfs image creation utility w/o systemd zstd "
|
||||
#url='https://github.com/archlinux/mkinitcpio'
|
||||
|
@ -17,6 +17,7 @@ install=mkinitcpio.install
|
|||
depends=('awk' 'mkinitcpio-busybox>=1.35.0' 'kmod' 'util-linux>=2.23' 'libarchive' 'coreutils'
|
||||
'bash' 'binutils' 'diffutils' 'findutils' 'grep' 'filesystem' 'gzip')
|
||||
checkdepends=('bats' 'bats-assert' 'lzop')
|
||||
conflicts=('systemd>0' 'cryptsetup<2.7.0-2' 'mdadm<4.3-2' 'lvm2<2.03.23-2')
|
||||
optdepends=('zstd: Use zstd compression for the initramfs image'
|
||||
'bzip2: Use bzip2 compression for the initramfs image'
|
||||
'lzop: Use lzo compression for the initramfs image'
|
||||
|
@ -42,6 +43,11 @@ package() {
|
|||
make -C $pkgname-$pkgver DESTDIR="$pkgdir" install
|
||||
rm -f "${pkgdir}"/usr/lib/initcpio/install/sd-*
|
||||
rm -f "${pkgdir}/etc/mkinitcpio.conf"
|
||||
## The following two files are provided by eudev and the ones
|
||||
## provided here contain systemd commands which wouldn't work on obarun or joborun
|
||||
rm -f "${pkgdir}/usr/lib/initcpio/install/udev"
|
||||
rm -f "${pkgdir}/usr/lib/initcpio/hooks/udev"
|
||||
|
||||
install -Dm644 "${srcdir}/mkinitcpio.conf" "${pkgdir}/etc/mkinitcpio.conf"
|
||||
}
|
||||
|
||||
|
@ -54,10 +60,9 @@ license=(GPL)
|
|||
validpgpkeys=('ECCAC84C1BA08A6CC8E63FBBF22FB1D78A77AEAB' # Giancarlo Razzolini
|
||||
'C100346676634E80C940FB9E9C02FF419FECBE16') # Morten Linderud
|
||||
|
||||
sha256sums=(443b0d8c370a4dc12778a10cb12eba7b088dcb3090b42519cefb6f20ae585c44 # mkinitcpio-37.3.tar.gz
|
||||
753d58cee327c061e5078c8685f65aa17c1600ed0bbc6aa19ce49b8b335a5477 # mkinitcpio-37.3.tar.gz.sig
|
||||
sha256sums=(c64ff852c63d3ee668950e0a4e10a2eae020e079025fa9ad23261e3221cddc05 # mkinitcpio-38.tar.gz
|
||||
9086ddcbfe139e2956f12f9070e515fcf7e97fd23479ee35b71cf12163edb33b # mkinitcpio-38.tar.gz.sig
|
||||
c4afeb6b3300c4d50c3f01233705b542f59d6e95a7670f7efde097ea209ef5bd # nosystemd.patch
|
||||
005d909551dec1dbb417457f0277076c5087902e9256eb5f1a77af3798c7c3de) # mkinitcpio.conf
|
||||
|
||||
## 84ff533bf0d07c4c44ca91f2d141ae9a799c5bc99453cbaa7ed4ec27b586bd47 mkinitcpio-37.3-01-x86_64.pkg.tar.lz
|
||||
|
||||
## bf779f7e9d8eb6e19ccf4b67f808a751abf98a71dd4fb0a7dc03f5c30fc497c7 mkinitcpio-38-01-x86_64.pkg.tar.lz
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
# Contributor: Thomas Bächler <thomas@archlinux.org>
|
||||
|
||||
pkgname=mkinitcpio
|
||||
pkgver=37.3
|
||||
pkgver=38
|
||||
pkgrel=1
|
||||
pkgdesc="Modular initramfs image creation utility"
|
||||
arch=('any')
|
||||
|
@ -13,6 +13,12 @@ license=('GPL')
|
|||
depends=('awk' 'mkinitcpio-busybox>=1.19.4-2' 'kmod' 'util-linux>=2.23' 'libarchive' 'coreutils'
|
||||
'bash' 'binutils' 'diffutils' 'findutils' 'grep' 'filesystem>=2011.10-1' 'zstd' 'systemd')
|
||||
checkdepends=('bats' 'bats-assert' 'lzop')
|
||||
conflicts=(
|
||||
'systemd<255.4-2'
|
||||
'cryptsetup<2.7.0-2'
|
||||
'mdadm<4.3-2'
|
||||
'lvm2<2.03.23-2'
|
||||
)
|
||||
optdepends=('gzip: Use gzip compression for the initramfs image'
|
||||
'xz: Use lzma or xz compression for the initramfs image'
|
||||
'bzip2: Use bzip2 compression for the initramfs image'
|
||||
|
@ -23,9 +29,9 @@ provides=('initramfs')
|
|||
backup=('etc/mkinitcpio.conf')
|
||||
source=("https://sources.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig})
|
||||
install=mkinitcpio.install
|
||||
sha512sums=('edee8dfbc452a0fc6ca9e8c7321beffa4463e504641b99a8d08ab9df665b697a0192f7760994b9917f34ba83d15543dedd3c4690364663b4534724a06a262db7'
|
||||
sha512sums=('ad1a4895e5cc3a01637f71d96ddb79d7f45708ec7305ffdb874403a1eb3c1743d121f28d93273b91792298eb21bcc0c5d9ef1ab3a3773083d60da5bdaee59d6e'
|
||||
'SKIP')
|
||||
b2sums=('f903348aa23983b4de1e095420acc358a09a6fd0c8ed9a9a7b9bd7df0bfde0bb17869996759f8f3c73ada85dd3ee3f83958401e1f9fa15aaacc06b048fe13660'
|
||||
b2sums=('4bc50da7196a69dc0ab7e7de345684baebbb655f9a07def9ac36a7f1c9aec752cf41c62134d6bbf240d8f49c6492a211f152bab062ec09457791d7ab030f1bc5'
|
||||
'SKIP')
|
||||
validpgpkeys=('ECCAC84C1BA08A6CC8E63FBBF22FB1D78A77AEAB' # Giancarlo Razzolini
|
||||
'C100346676634E80C940FB9E9C02FF419FECBE16') # Morten Linderud
|
||||
|
|
Loading…
Reference in a new issue