From 1674bc8219b0142bdc9d9f892e097738ca774efe Mon Sep 17 00:00:00 2001 From: Finic8 Date: Thu, 17 Aug 2017 16:40:59 +0200 Subject: [PATCH] add pkgver() to git packages --- src/spl-dkms/PKGBUILD.sh | 4 ++++ src/spl-utils/PKGBUILD.sh | 4 ++++ src/spl/PKGBUILD.sh | 4 ++++ src/zfs-dkms/PKGBUILD.sh | 4 ++++ src/zfs-utils/PKGBUILD.sh | 4 ++++ src/zfs/PKGBUILD.sh | 4 ++++ 6 files changed, 24 insertions(+) diff --git a/src/spl-dkms/PKGBUILD.sh b/src/spl-dkms/PKGBUILD.sh index 616e807..014b572 100755 --- a/src/spl-dkms/PKGBUILD.sh +++ b/src/spl-dkms/PKGBUILD.sh @@ -41,4 +41,8 @@ package() { EOF +if [[ ${archzfs_package_group} =~ -git$ ]]; then + sed -i "/^build()/ i pkgver() { \n cd \"${spl_workdir}\" \n git describe --long | sed 's/^spl-//;s/\\\([^-]*-g\\\)/r\\\1/;s/-/./g' \n}" ${spl_dkms_pkgbuild_path}/PKGBUILD +fi + pkgbuild_cleanup "${spl_dkms_pkgbuild_path}/PKGBUILD" diff --git a/src/spl-utils/PKGBUILD.sh b/src/spl-utils/PKGBUILD.sh index 3db70b7..259cebc 100755 --- a/src/spl-utils/PKGBUILD.sh +++ b/src/spl-utils/PKGBUILD.sh @@ -30,4 +30,8 @@ package() { } EOF +if [[ ${archzfs_package_group} =~ -git$ ]]; then + sed -i "/^build()/ i pkgver() { \n cd \"${spl_workdir}\" \n git describe --long | sed 's/^spl-//;s/\\\([^-]*-g\\\)/r\\\1/;s/-/./g' \n}" ${spl_utils_pkgbuild_path}/PKGBUILD +fi + pkgbuild_cleanup "${spl_utils_pkgbuild_path}/PKGBUILD" diff --git a/src/spl/PKGBUILD.sh b/src/spl/PKGBUILD.sh index fe6d394..516aa0e 100755 --- a/src/spl/PKGBUILD.sh +++ b/src/spl/PKGBUILD.sh @@ -54,4 +54,8 @@ package_${spl_pkgname}-headers() { EOF +if [[ ${archzfs_package_group} =~ -git$ ]]; then + sed -i "/^build()/ i pkgver() { \n cd \"${spl_workdir}\" \n echo \$(git describe --long | sed 's/^spl-//;s/\\\([^-]*-g\\\)/r\\\1/;s/-/./g').${kernel_version_full_pkgver} \n}" ${spl_pkgbuild_path}/PKGBUILD +fi + pkgbuild_cleanup "${spl_pkgbuild_path}/PKGBUILD" diff --git a/src/zfs-dkms/PKGBUILD.sh b/src/zfs-dkms/PKGBUILD.sh index 689f4a0..d98bb7b 100755 --- a/src/zfs-dkms/PKGBUILD.sh +++ b/src/zfs-dkms/PKGBUILD.sh @@ -45,4 +45,8 @@ package() { EOF +if [[ ${archzfs_package_group} =~ -git$ ]]; then + sed -i "/^build()/ i pkgver() { \n cd \"${zfs_workdir}\" \n git describe --long | sed 's/^zfs-//;s/\\\([^-]*-g\\\)/r\\\1/;s/-/./g' \n}" ${zfs_dkms_pkgbuild_path}/PKGBUILD +fi + pkgbuild_cleanup "${zfs_dkms_pkgbuild_path}/PKGBUILD" diff --git a/src/zfs-utils/PKGBUILD.sh b/src/zfs-utils/PKGBUILD.sh index 95a661d..97bca1b 100755 --- a/src/zfs-utils/PKGBUILD.sh +++ b/src/zfs-utils/PKGBUILD.sh @@ -58,4 +58,8 @@ package() { } EOF +if [[ ${archzfs_package_group} =~ -git$ ]]; then + sed -i "/^build()/ i pkgver() { \n cd \"${zfs_workdir}\" \n git describe --long | sed 's/^zfs-//;s/\\\([^-]*-g\\\)/r\\\1/;s/-/./g' \n}" ${zfs_utils_pkgbuild_path}/PKGBUILD +fi + pkgbuild_cleanup "${zfs_utils_pkgbuild_path}/PKGBUILD" diff --git a/src/zfs/PKGBUILD.sh b/src/zfs/PKGBUILD.sh index c531c7c..db50b6c 100755 --- a/src/zfs/PKGBUILD.sh +++ b/src/zfs/PKGBUILD.sh @@ -56,4 +56,8 @@ package_${zfs_pkgname}-headers() { EOF +if [[ ${archzfs_package_group} =~ -git$ ]]; then + sed -i "/^build()/ i pkgver() { \n cd \"${zfs_workdir}\" \n echo \$(git describe --long | sed 's/^zfs-//;s/\\\([^-]*-g\\\)/r\\\1/;s/-/./g').${kernel_version_full_pkgver} \n}" ${zfs_pkgbuild_path}/PKGBUILD +fi + pkgbuild_cleanup "${zfs_pkgbuild_path}/PKGBUILD"