Move libblkid to a seperate package (#8710)

This commit is contained in:
Schrijvers Luc
2023-05-23 09:09:42 +02:00
committed by GitHub
parent e405fbe882
commit a9d6812653

View File

@@ -6,7 +6,7 @@ LICENSE="GNU GPL v2
GNU LGPL v2
BSD (4-clause)
Public Domain"
REVISION="3"
REVISION="4"
SOURCE_URI="https://www.kernel.org/pub/linux/utils/util-linux/v$portVersion/util-linux-$portVersion.tar.xz"
CHECKSUM_SHA256="743f9d0c7252b6db246b659c1e1ce0bd45d8d4508b4dfa427bbb4a3e9b9f62b5"
SOURCE_DIR="util-linux-$portVersion"
@@ -56,11 +56,21 @@ PROVIDES_libuuid="
util_linux${secondaryArchSuffix}_libuuid = $portVersionCompat
cmd:uuidgen$commandSuffix = $portVersion
lib:libuuid$secondaryArchSuffix = $libuuidVersionCompat
"
"
REQUIRES_libuuid="
haiku$secondaryArchSuffix
lib:libintl$secondaryArchSuffix
"
"
SUMMARY_libblkid="A library to identify block devices"
PROVIDES_libblkid="
util_linux${secondaryArchSuffix}_libblkid = $portVersionCompat
lib:libblkid$secondaryArchSuffix = $libblkidVersionCompat
"
REQUIRES_libblkid="
haiku$secondaryArchSuffix
util_linux$secondaryArchSuffix == $portVersion base
"
SUMMARY_cal="A random collection of Linux utilities (cal)"
PROVIDES_cal="
@@ -86,12 +96,12 @@ PROVIDES_fdisk="
cmd:blkid$commandSuffix = $portVersion
cmd:fdisk$commandSuffix = $portVersionCompat
lib:libfdisk$secondaryArchSuffix = $libfdiskVersionCompat
lib:libblkid$secondaryArchSuffix = $libblkidVersionCompat
"
REQUIRES_fdisk="
util_linux$secondaryArchSuffix == $portVersion base
haiku$secondaryArchSuffix
lib:libintl$secondaryArchSuffix
lib:libblkid$secondaryArchSuffix
lib:libncursesw$secondaryArchSuffix
lib:libuuid$secondaryArchSuffix
"
@@ -105,6 +115,8 @@ PROVIDES_devel="
"
REQUIRES_devel="
util_linux$secondaryArchSuffix == $portVersion base
util_linux${secondaryArchSuffix}_libblkid
util_linux${secondaryArchSuffix}_libuuid
"
BUILD_REQUIRES="
@@ -212,6 +224,9 @@ INSTALL()
"$dataDir"/bash-completion/completions/cal \
"$manDir"/man1/cal.1
packageEntries libblkid \
$libDir/libblkid.so.*
# With the fdisk subpackage being marked as untested, haikuporter does not
# create the subdirectory for it in $packagingBaseDir when ALLOW_UNTESTED=no
# so we need to skip the call to "packageEntries fdisk ..." in that case.
@@ -224,7 +239,7 @@ INSTALL()
"$commandBinDir"/fdisk \
"$dataDir"/bash-completion/completions/fdisk \
"$manDir"/man8/fdisk.8 \
$libDir/libblkid.so.* $libDir/libfdisk.so.* $commandBinDir/blkid
$libDir/libfdisk.so.* $commandBinDir/blkid
packageEntries libuuid $libDir/libuuid.so.* $commandBinDir/uuidgen