upg kbd thin-provisioning-tools
This commit is contained in:
parent
acef1baec4
commit
bdd1bc5bea
7 changed files with 33 additions and 23 deletions
1
kbd/NOTE
Normal file
1
kbd/NOTE
Normal file
|
@ -0,0 +1 @@
|
|||
in order to use the git for the cherry pick fix in git git bison are needed
|
32
kbd/PKGBUILD
32
kbd/PKGBUILD
|
@ -7,14 +7,14 @@
|
|||
|
||||
pkgname=kbd
|
||||
pkgver=2.6.3
|
||||
pkgrel=01
|
||||
pkgrel=02
|
||||
pkgdesc="Keytable files and keyboard utilities"
|
||||
url="http://www.kbd-project.org"
|
||||
depends=('glibc' 'pam')
|
||||
#makedepends=('check' 'git' 'gettext' 'autoconf' 'automake')
|
||||
makedepends=('check' 'gettext' 'autoconf' 'automake')
|
||||
#source=(git+https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git#tag=v$pkgver?signed
|
||||
source=(https://www.kernel.org/pub/linux/utils/${pkgname}/${pkgname}-${pkgver}.tar.{gz,sign}
|
||||
makedepends=('check' 'git' 'gettext' 'autoconf' 'automake')
|
||||
#makedepends=('check' 'gettext' 'autoconf' 'automake')
|
||||
source=(git+https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git#tag=v$pkgver?signed
|
||||
#source=(https://www.kernel.org/pub/linux/utils/${pkgname}/${pkgname}-${pkgver}.tar.{gz,sign}
|
||||
'fix-euro2.patch'
|
||||
'vlock.pam')
|
||||
backup=('etc/pam.d/vlock')
|
||||
|
@ -23,7 +23,8 @@ conflicts=('vlock')
|
|||
replaces=('vlock')
|
||||
|
||||
prepare() {
|
||||
cd ${pkgname}-${pkgver}
|
||||
# cd ${pkgname}-${pkgver}
|
||||
cd ${pkgname}
|
||||
# rename keymap files with the same names
|
||||
# this is needed because when only name of keymap is specified
|
||||
# loadkeys loads the first keymap it can find, which is bad (see FS#13837)
|
||||
|
@ -35,17 +36,21 @@ prepare() {
|
|||
mv data/keymaps/i386/colemak/{en-latin9,colemak}.map
|
||||
# fix euro2 #28213
|
||||
patch -Np1 -i ../fix-euro2.patch
|
||||
# Do not look up include files in the current working directory
|
||||
git cherry-pick -n '8b7f70904343153b658b8640ba14fc7d583cdc57'
|
||||
autoreconf -if
|
||||
}
|
||||
|
||||
build() {
|
||||
cd ${pkgname}-${pkgver}
|
||||
# cd ${pkgname}-${pkgver}
|
||||
cd ${pkgname}
|
||||
./configure --prefix=/usr --sysconfdir=/etc --datadir=/usr/share/kbd --mandir=/usr/share/man --enable-optional-progs
|
||||
make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes
|
||||
}
|
||||
|
||||
check() {
|
||||
cd ${pkgname}-${pkgver}
|
||||
# cd ${pkgname}-${pkgver}
|
||||
cd ${pkgname}
|
||||
|
||||
# This test is expected to fail since kbd-fix-loadkmap-compat.patch modifies the binary format
|
||||
sed -e 's|dumpkeys-bkeymap ||' -i tests/Makefile
|
||||
|
@ -54,7 +59,8 @@ check() {
|
|||
}
|
||||
|
||||
package() {
|
||||
cd ${pkgname}-${pkgver}
|
||||
# cd ${pkgname}-${pkgver}
|
||||
cd ${pkgname}
|
||||
make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes DESTDIR="${pkgdir}" install
|
||||
install -Dm644 ../vlock.pam "${pkgdir}"/etc/pam.d/vlock
|
||||
}
|
||||
|
@ -67,9 +73,11 @@ license=('GPL')
|
|||
|
||||
validpgpkeys=('7F2A3D07298149A0793C9A4EA45ABA544CFFD434') # Alexey Gladkov
|
||||
|
||||
sha256sums=(6103cfc3760ddc1ea8e7b6a71ff340670b2942c157abae88bdd0fb747bc64907 # kbd-2.6.3.tar.gz
|
||||
3bedb57873d4815862dee0349cebc86ad37b0dd4961913cc174049860d34f630 # kbd-2.6.3.tar.sign
|
||||
sha256sums=(SKIP
|
||||
# 6103cfc3760ddc1ea8e7b6a71ff340670b2942c157abae88bdd0fb747bc64907 # kbd-2.6.3.tar.gz
|
||||
# 3bedb57873d4815862dee0349cebc86ad37b0dd4961913cc174049860d34f630 # kbd-2.6.3.tar.sign
|
||||
a5e0167b6a82a9eb4d581d56baab930c2d80f5541dc34630460b73e1115384b8 # fix-euro2.patch
|
||||
5c2d377a87121e7c399534fb91e2ffc0cc1e75d44a8f07ee6f55c9c089bc81e4) # vlock.pam
|
||||
|
||||
## 4b7ffd98c3a84243b38f0ca146d4b65a726dd74e78d1b77e468f4c3579031739 kbd-2.6.3-01-x86_64.pkg.tar.lz
|
||||
## f5c40c7bb86ae2bf3a31b3b6b91ca125f0490e55f22fc04a389a1919e4417323 kbd-2.6.3-02-x86_64.pkg.tar.lz
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
pkgname=kbd
|
||||
pkgver=2.6.3
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc="Keytable files and keyboard utilities"
|
||||
arch=('x86_64')
|
||||
url="http://www.kbd-project.org"
|
||||
|
@ -38,6 +38,8 @@ prepare() {
|
|||
mv data/keymaps/i386/colemak/{en-latin9,colemak}.map
|
||||
# fix euro2 #28213
|
||||
patch -Np1 -i ../fix-euro2.patch
|
||||
# Do not look up include files in the current working directory
|
||||
git cherry-pick -n '8b7f70904343153b658b8640ba14fc7d583cdc57'
|
||||
autoreconf -if
|
||||
}
|
||||
|
||||
|
|
|
@ -1 +1 @@
|
|||
rm -rf {src,pkg,*tar.gz*,*.sign}
|
||||
rm -rf {src,pkg,*tar.gz*,*.sign,kbd}
|
||||
|
|
4
kbd/deps
4
kbd/deps
|
@ -4,3 +4,7 @@ automake
|
|||
autoconf
|
||||
|
||||
|
||||
git
|
||||
bison
|
||||
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
pkgname=thin-provisioning-tools
|
||||
pkgver=1.0.9
|
||||
pkgrel=01
|
||||
pkgrel=02
|
||||
pkgdesc='Suite of tools for manipulating the metadata of the dm-thin device-mapper target'
|
||||
url="https://github.com/jthornber/thin-provisioning-tools"
|
||||
depends=('gcc-libs')
|
||||
|
@ -37,12 +37,7 @@ arch=(x86_64)
|
|||
|
||||
license=(GPL3)
|
||||
|
||||
# Note: Arch reports a differen sum for the source, we triple checked it and filed an issue about it
|
||||
# It is not the first time they get as sloppy as changing the code within hours and releasing it with
|
||||
# the same version number. This is about the 3rd time this happened with Arch rushing to build from
|
||||
# upstream within minutes of release!
|
||||
|
||||
sha256sums=(830a6f86f96bfaadd779ca36b15a02b21fd1082ea0e72102b269d999d0b20429) # thin-provisioning-tools-1.0.9.tar.gz
|
||||
|
||||
## 82a436594019eddd04b750c65fe743d6003313e464941f1bdd5c663b9ca51e2f thin-provisioning-tools-1.0.9-01-x86_64.pkg.tar.lz
|
||||
## bd752f61e2fea27ca62e314dfcfafc8b60cfa31d2ee8ec7c2c4430a8d6cf9126 thin-provisioning-tools-1.0.9-02-x86_64.pkg.tar.lz
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
pkgname=thin-provisioning-tools
|
||||
pkgver=1.0.9
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc='Suite of tools for manipulating the metadata of the dm-thin device-mapper target'
|
||||
arch=('x86_64')
|
||||
url='https://github.com/jthornber/thin-provisioning-tools'
|
||||
|
@ -11,7 +11,7 @@ license=('GPL3')
|
|||
depends=('gcc-libs')
|
||||
makedepends=('cargo')
|
||||
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/jthornber/${pkgname}/archive/v${pkgver}.tar.gz")
|
||||
sha256sums=('4ff542b438babf4e17378bc5c6d823ec35c00f72bde49fe229a803bba4634512')
|
||||
sha256sums=('830a6f86f96bfaadd779ca36b15a02b21fd1082ea0e72102b269d999d0b20429')
|
||||
|
||||
build() {
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
|
|
Loading…
Reference in a new issue