Date: Thursday, February 24, 2022 @ 12:13:24 Author: dvzrv Revision: 1136405
upgpkg: libtracefs 1.3.0-1: Upgrade to 1.3.0 Split out docs to libtracefs-docs. Add debug package. Remove unneeded patch for full RELRO. Remove unneeded quotes and curly braces. Modified: libtracefs/trunk/PKGBUILD Deleted: libtracefs/trunk/libtracefs-1.2.0-full_relro.patch -----------------------------------+ PKGBUILD | 73 ++++++++++++++++++++++-------------- libtracefs-1.2.0-full_relro.patch | 12 ----- 2 files changed, 45 insertions(+), 40 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-02-24 11:59:26 UTC (rev 1136404) +++ PKGBUILD 2022-02-24 12:13:24 UTC (rev 1136405) @@ -1,42 +1,59 @@ # Maintainer: David Runge <[email protected]> -pkgname=libtracefs -pkgver=1.2.5 +pkgbase=libtracefs +pkgname=(libtracefs libtracefs-docs) +pkgver=1.3.0 pkgrel=1 pkgdesc="Linux kernel trace file system library" -arch=('x86_64') +arch=(x86_64) url="https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/about/"; -license=('GPL2' 'LGPL2.1') -depends=('glibc') -makedepends=('asciidoc' 'libtraceevent' 'xmlto') -provides=('libtracefs.so') -source=("$pkgname-$pkgver.tar.gz::https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/snapshot/${pkgname}-${pkgver}.tar.gz"; - "$pkgname-1.2.0-docs_makefile.patch" - "$pkgname-1.2.0-full_relro.patch") -noextract=() -sha512sums=('138951c7b4b0a8e08b38529177cfa440f48f6b9a352809de71e5b2d302c10f9f814405f6cc0c2fe89d4efa3c3c1da95e933fcf048fdb25c51d440e095d9b6bd2' - 'bdfffba9957d889c60baea9c197709bf1a62d30ac4b8fd47d930b8d5b67fa040817b9a835e226dd1201f2ccdb7fcb43a12093c2b559fb6c0edc3e9ba167062c2' - '2956c79c3a5952bbe1f2b67df3adb0d6ce83c7cf4220811e7b88a133062cd6e2c238c58a6f82c140adb66ed27a6d4a4a40916ea9dc171ae7d747dbfcb98eac25') -b2sums=('d06bbb2ea4269e03b142fd12056e2bca6008d64a3e40e5b521f2da0214db5b0768e71203b59784c1f1a0adc9d2b7450536d40d1edf032e9012dc4d8be98c6f21' - '1340af2c65dc344912715c69827d5849fda83e4bcf136da3ccdbee4e3b508e9b557af0828914dff8d27abebbdbdab975d8800432d5252b6b1eb0da08b0cb4b02' - 'f7d3982f927bfd9a4125d88aa4ffc9a4d4477d6e3867a29e596bf59791789e974a50fe6b648d7f650134310d3823f7f3b8af7c113bc52b582a11637b9752c468') +license=(GPL2 LGPL2.1) +makedepends=(asciidoc libtraceevent xmlto) +provides=(libtracefs.so) +options=(debug) +source=( + $pkgname-$pkgver.tar.gz::https://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git/snapshot/$pkgname-$pkgver.tar.gz + $pkgname-1.2.0-docs_makefile.patch +) +sha512sums=('78d123e0b30034a6aae2f6e365e11e81841ff3f9dda1a13803e3d1869f0d83c6541ba7809b9c5b7c3e72ae2267625ca5a99ffc1fa28931ff01252edd6dbb295c' + 'bdfffba9957d889c60baea9c197709bf1a62d30ac4b8fd47d930b8d5b67fa040817b9a835e226dd1201f2ccdb7fcb43a12093c2b559fb6c0edc3e9ba167062c2') +b2sums=('a099a9e41d6939625c78c3e8947996bfde87febb281d4df0eb4d3fe36c8042b86aaf127d4249ad96b66f24075842f87c4f1ad5489c3ee4b4acf790f6e08e12e4' + '1340af2c65dc344912715c69827d5849fda83e4bcf136da3ccdbee4e3b508e9b557af0828914dff8d27abebbdbdab975d8800432d5252b6b1eb0da08b0cb4b02') +_pick() { + local p="$1" f d; shift + for f; do + d="$srcdir/$p/${f#$pkgdir/}" + mkdir -p "$(dirname "$d")" + mv "$f" "$d" + rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")" + done +} + prepare() { - cd "$pkgname-$pkgver" - patch -Np 1 -i ../"$pkgname-1.2.0-docs_makefile.patch" - patch -Np 1 -i ../"$pkgname-1.2.0-full_relro.patch" + patch -d $pkgname-$pkgver -Np 1 -i ../$pkgname-1.2.0-docs_makefile.patch } build() { - cd "$pkgname-$pkgver" - make LDFLAGS="$LDFLAGS" - make doc + make LDFLAGS="$LDFLAGS" -C $pkgname-$pkgver + make doc -C $pkgname-$pkgver } -package() { - depends+=('libtraceevent.so') +package_libtracefs() { + depends+=(glibc libtraceevent.so) + optdepends=('libtracefs-docs: for documentation') - cd "$pkgname-$pkgver" - make libdir_relative=lib prefix=/usr DESTDIR="$pkgdir/" install - make libdir_relative=lib prefix=/usr DESTDIR="$pkgdir/" install -C Documentation + make libdir_relative=lib prefix=/usr DESTDIR="$pkgdir/" install -C $pkgname-$pkgver + make libdir_relative=lib prefix=/usr DESTDIR="$pkgdir/" install -C $pkgname-$pkgver/Documentation + + ( + cd "$pkgdir" + _pick libtracefs-docs usr/share/doc + ) } + +package_libtracefs-docs() { + pkgdesc+=" - documentation" + + mv -v $pkgname/* "$pkgdir" +} Deleted: libtracefs-1.2.0-full_relro.patch =================================================================== --- libtracefs-1.2.0-full_relro.patch 2022-02-24 11:59:26 UTC (rev 1136404) +++ libtracefs-1.2.0-full_relro.patch 2022-02-24 12:13:24 UTC (rev 1136405) @@ -1,12 +0,0 @@ -diff -ruN a/scripts/utils.mk b/scripts/utils.mk ---- a/scripts/utils.mk 2021-05-13 04:59:12.000000000 +0200 -+++ b/scripts/utils.mk 2021-05-14 21:05:11.357878988 +0200 -@@ -56,7 +56,7 @@ - - do_compile_shared_library = \ - ($(print_shared_lib_compile) \ -- $(CC) --shared $^ '-Wl,-soname,$(1),-rpath=$$ORIGIN' -o $@ $(LIBS)) -+ $(CC) --shared $^ '-Wl,-soname,$(1),-rpath=$$ORIGIN' $(LDFLAGS) -o $@ $(LIBS)) - - do_compile_plugin_obj = \ - ($(print_plugin_obj_compile) \
