wok-next diff util-linux/receipt @ rev 21723

busybox: update patches
author Pascal Bellard <pascal.bellard@slitaz.org>
date Tue Sep 01 10:44:52 2020 +0000 (2020-09-01)
parents a43eb412173d
children
line diff
     1.1 --- a/util-linux/receipt	Wed Dec 05 18:07:35 2018 +0200
     1.2 +++ b/util-linux/receipt	Tue Sep 01 10:44:52 2020 +0000
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt v2.
     1.5  
     1.6  PACKAGE="util-linux"
     1.7 -VERSION="2.33"
     1.8 +VERSION="2.33.1"
     1.9  CATEGORY="meta"
    1.10  SHORT_DESC="Random collection of Linux utilities"
    1.11  MAINTAINER="devel@slitaz.org"
    1.12 @@ -9,20 +9,99 @@
    1.13  WEB_SITE="https://en.wikipedia.org/wiki/Util-linux"
    1.14  LFS="http://www.linuxfromscratch.org/lfs/view/development/chapter06/util-linux.html"
    1.15  
    1.16 -HIVERSION=$(echo $VERSION | cut -d. -f1,2)
    1.17 +HIVERSION=$(echo $VERSION | cut -d. -f1,2) # may be 2 or 3 numbers: 2.33, 2.33.1
    1.18  TARBALL="$PACKAGE-$VERSION.tar.xz"
    1.19  WGET_URL="https://www.kernel.org/pub/linux/utils/util-linux/v$HIVERSION/$TARBALL"
    1.20 +TARBALL_SHA1="f57232d9594d23e7c20b5728b24bf4e5d977accc"
    1.21  
    1.22 -BUILD_DEPENDS="libcap-dev readline-dev python-dev glib gtk-doc \
    1.23 -libxslt gettext-dev ncurses-dev zlib-dev"
    1.24 +BUILD_DEPENDS="libcap-dev readline-dev python-dev glib gtk-doc libxslt \
    1.25 +gettext-dev ncurses-dev zlib-dev"
    1.26 +SPLIT="\
    1.27 +$PACKAGE-blkid     $PACKAGE-blkid-dev $PACKAGE-blockdev  $PACKAGE-cfdisk \
    1.28 +$PACKAGE-column    $PACKAGE-cramfs    $PACKAGE-eject     $PACKAGE-fdisk \
    1.29 +$PACKAGE-fdisk-dev $PACKAGE-flock     $PACKAGE-getopt    $PACKAGE-minix \
    1.30 +$PACKAGE-mkfs      $PACKAGE-mount     $PACKAGE-mount-dev $PACKAGE-partx \
    1.31 +$PACKAGE-setterm   $PACKAGE-sfdisk    $PACKAGE-smartcols $PACKAGE-smartcols-dev \
    1.32 +$PACKAGE-uuid      $PACKAGE-uuid-dev  $PACKAGE-whereis   $PACKAGE-misc"
    1.33 +
    1.34 +COPY_blkid="bin/lsblk sbin/blkid libblkid.so.1*"
    1.35 +COPY_blkid_dev="blkid.h blkid.pc libblkid.so"
    1.36 +COPY_blockdev="sbin/blockdev"
    1.37 +COPY_cfdisk="sbin/cfdisk cfdisk.desktop"
    1.38 +COPY_column="bin/column bin/col bin/colrm bin/colcrt"
    1.39 +COPY_cramfs="sbin/*.cramfs"
    1.40 +COPY_eject="bin/eject"
    1.41 +COPY_fdisk="sbin/fdisk libfdisk.so.1*"
    1.42 +COPY_fdisk_dev="libfdisk.h fdisk.pc libfdisk.so"
    1.43 +COPY_flock="bin/flock bin/lslocks"
    1.44 +COPY_getopt="bin/getopt"
    1.45 +COPY_minix="sbin/*.minix"
    1.46 +COPY_mkfs="sbin/mkfs sbin/mkswap"
    1.47 +COPY_mount="bin/findmnt bin/mount libmount.so.1* bin/mountpoint bin/umount"
    1.48 +COPY_mount_dev="libmount.h mount.pc libmount.so"
    1.49 +COPY_partx="sbin/addpart sbin/delpart sbin/partx sbin/resizepart"
    1.50 +COPY_setterm="bin/setterm"
    1.51 +COPY_sfdisk="sbin/sfdisk"
    1.52 +COPY_smartcols="libsmartcols.so.1*"
    1.53 +COPY_smartcols_dev="libsmartcols.h smartcols.pc libsmartcols.so"
    1.54 +COPY_uuid="libuuid.so.1* bin/uuidgen sbin/uuidd"
    1.55 +COPY_uuid_dev="uuid.h uuid.pc libuuid.so"
    1.56 +COPY_whereis="bin/whereis"
    1.57 +COPY_misc="@std @dev @rm"
    1.58 +
    1.59 +CAT_blkid="base-system|blkid utility"
    1.60 +CAT_blkid_dev="development|blkid development files"
    1.61 +CAT_blockdev="base-system|blockdev utility"
    1.62 +CAT_cfdisk="system-tools|cfdisk utility"
    1.63 +CAT_column="base-system|column utility"
    1.64 +CAT_cramfs="system-tools|cramfs utilities"
    1.65 +CAT_eject="base-system|eject utility"
    1.66 +CAT_fdisk="system-tools|fdisk utility"
    1.67 +CAT_fdisk_dev="development|fdisk utility development files"
    1.68 +CAT_flock="base-system|flock utility"
    1.69 +CAT_getopt="base-system|getopt utility"
    1.70 +CAT_minix="system-tools|minix utilities"
    1.71 +CAT_mkfs="base-system|mkfs utilities"
    1.72 +CAT_mount="base-system|mount utilities"
    1.73 +CAT_mount_dev="development|mount utilities development files"
    1.74 +CAT_partx="system-tools|partx utilities"
    1.75 +CAT_setterm="base-system|setterm utility"
    1.76 +CAT_sfdisk="system-tools|sfdisk utility"
    1.77 +CAT_smartcols="system-tools|smartcols library"
    1.78 +CAT_smartcols_dev="development|smartcols library development files"
    1.79 +CAT_uuid="base-system|uuid utility and library"
    1.80 +CAT_uuid_dev="development|uuid utility and library development files"
    1.81 +CAT_whereis="base-system|whereis utility"
    1.82 +CAT_misc="system-tools|misc utilities"
    1.83 +
    1.84 +DEPENDS_blkid="util-linux-mount util-linux-smartcols util-linux-uuid"
    1.85 +DEPENDS_blkid_dev="util-linux-blkid util-linux-uuid-dev"
    1.86 +DEPENDS_blockdev=" "
    1.87 +DEPENDS_cfdisk="ncurses util-linux-fdisk util-linux-mount util-linux-smartcols"
    1.88 +DEPENDS_column="util-linux-smartcols"
    1.89 +DEPENDS_cramfs="zlib"
    1.90 +DEPENDS_eject="util-linux-mount"
    1.91 +DEPENDS_fdisk="ncurses readline util-linux-blkid util-linux-smartcols util-linux-uuid"
    1.92 +DEPENDS_fdisk_dev="util-linux-fdisk util-linux-blkid-dev util-linux-uuid-dev"
    1.93 +DEPENDS_flock="util-linux-mount util-linux-smartcols"
    1.94 +DEPENDS_getopt=" "
    1.95 +DEPENDS_minix=" "
    1.96 +DEPENDS_mkfs="util-linux-blkid util-linux-uuid"
    1.97 +DEPENDS_mount="util-linux-blkid util-linux-smartcols"
    1.98 +DEPENDS_mount_dev="util-linux-mount util-linux-blkid-dev"
    1.99 +DEPENDS_partx="util-linux-blkid util-linux-smartcols"
   1.100 +DEPENDS_setterm="ncurses"
   1.101 +DEPENDS_sfdisk="ncurses readline util-linux-fdisk util-linux-smartcols"
   1.102 +DEPENDS_smartcols=" "
   1.103 +DEPENDS_smartcols_dev="util-linux-smartcols"
   1.104 +DEPENDS_uuid=" "
   1.105 +DEPENDS_uuid_dev="util-linux-uuid"
   1.106 +DEPENDS_whereis=" "
   1.107 +DEPENDS_misc="ncurses python util-linux-blkid util-linux-mount util-linux-smartcols util-linux-uuid"
   1.108 +
   1.109 +TAGS_std="LFS"
   1.110 +
   1.111  COOKOPTS="!menus"
   1.112 -SPLIT="$PACKAGE-bash-completion $PACKAGE-blkid $PACKAGE-blkid-dev \
   1.113 -$PACKAGE-blockdev $PACKAGE-cfdisk $PACKAGE-column $PACKAGE-cramfs \
   1.114 -$PACKAGE-eject $PACKAGE-fdisk $PACKAGE-fdisk-dev $PACKAGE-flock \
   1.115 -$PACKAGE-getopt $PACKAGE-manpages $PACKAGE-minix $PACKAGE-mkfs \
   1.116 -$PACKAGE-mount $PACKAGE-mount-dev $PACKAGE-partx $PACKAGE-setterm \
   1.117 -$PACKAGE-sfdisk $PACKAGE-smartcols $PACKAGE-smartcols-dev \
   1.118 -$PACKAGE-uuid $PACKAGE-uuid-dev $PACKAGE-whereis $PACKAGE-misc"
   1.119  
   1.120  compile_rules() {
   1.121  	mkdir -p $install/var/lib/hwclock
   1.122 @@ -38,153 +117,3 @@
   1.123  	install -Dm644 $stuff/cfdisk.desktop \
   1.124  		$install/usr/share/applications/cfdisk.desktop
   1.125  }
   1.126 -
   1.127 -genpkg_rules() {
   1.128 -	case ${PACKAGE#util-linux-} in
   1.129 -		bash-completion)
   1.130 -			copy bash-completion/
   1.131 -			CAT="shells|BASH completions"
   1.132 -			DEPENDS="bash"
   1.133 -			;;
   1.134 -		blkid)
   1.135 -			copy lsblk blkid libblkid.so*
   1.136 -			CAT="base-system|blkid utility"
   1.137 -			DEPENDS="glibc-base util-linux-mount util-linux-smartcols \
   1.138 -			util-linux-uuid"
   1.139 -			;;
   1.140 -		blkid-dev)
   1.141 -			copy blkid.h blkid.pc
   1.142 -			CAT="development|blkid development files"
   1.143 -			DEPENDS="util-linux-blkid util-linux-uuid-dev"
   1.144 -			;;
   1.145 -		blockdev)
   1.146 -			copy blockdev
   1.147 -			CAT="base-system|blockdev utility"
   1.148 -			DEPENDS="glibc-base"
   1.149 -			;;
   1.150 -		cfdisk)
   1.151 -			copy cfdisk cfdisk.desktop
   1.152 -			CAT="system-tools|cfdisk utility"
   1.153 -			DEPENDS="glibc-base ncurses util-linux-blkid util-linux-fdisk \
   1.154 -			util-linux-mount util-linux-smartcols util-linux-uuid"
   1.155 -			;;
   1.156 -		column)
   1.157 -			copy column col colrm colcrt
   1.158 -			CAT="base-system|column utility"
   1.159 -			DEPENDS="glibc-base"
   1.160 -			;;
   1.161 -		cramfs)
   1.162 -			copy *.cramfs
   1.163 -			CAT="system-tools|cramfs utilities"
   1.164 -			DEPENDS="glibc-base zlib"
   1.165 -			;;
   1.166 -		eject)
   1.167 -			copy eject
   1.168 -			CAT="base-system|eject utility"
   1.169 -			DEPENDS="glibc-base util-linux-blkid util-linux-mount \
   1.170 -			util-linux-uuid"
   1.171 -			;;
   1.172 -		fdisk)
   1.173 -			copy fdisk libfdisk.so*
   1.174 -			CAT="system-tools|fdisk utility"
   1.175 -			DEPENDS="glibc-base ncurses readline util-linux-blkid \
   1.176 -			util-linux-smartcols util-linux-uuid"
   1.177 -			;;
   1.178 -		fdisk-dev)
   1.179 -			copy libfdisk.h fdisk.pc
   1.180 -			CAT="development|fdisk utility development files"
   1.181 -			DEPENDS="util-linux-fdisk util-linux-blkid-dev util-linux-uuid-dev"
   1.182 -			;;
   1.183 -		flock)
   1.184 -			copy flock lslocks
   1.185 -			CAT="base-system|flock utility"
   1.186 -			DEPENDS="glibc-base"
   1.187 -			;;
   1.188 -		getopt)
   1.189 -			copy getopt
   1.190 -			CAT="base-system|getopt utility"
   1.191 -			DEPENDS="glibc-base"
   1.192 -			;;
   1.193 -		manpages)
   1.194 -			copy man/
   1.195 -			CAT="doc|manual pages"
   1.196 -			DEPENDS=" "
   1.197 -			;;
   1.198 -		minix)
   1.199 -			copy *.minix
   1.200 -			CAT="system-tools|minix utilities"
   1.201 -			DEPENDS="glibc-base"
   1.202 -			;;
   1.203 -		mkfs)
   1.204 -			copy mk*
   1.205 -			rm -r $fs/usr
   1.206 -			CAT="base-system|mkfs utilities"
   1.207 -			DEPENDS="glibc-base util-linux-blkid util-linux-uuid zlib"
   1.208 -			;;
   1.209 -		mount)
   1.210 -			copy findmnt mount libmount.so* mountpoint umount
   1.211 -			CAT="base-system|mount utilities"
   1.212 -			DEPENDS="glibc-base util-linux-blkid util-linux-uuid \
   1.213 -			util-linux-smartcols"
   1.214 -			;;
   1.215 -		mount-dev)
   1.216 -			copy libmount.h mount.pc
   1.217 -			CAT="development|mount utilities development files"
   1.218 -			DEPENDS="util-linux-mount util-linux-blkid-dev util-linux-uuid-dev"
   1.219 -			;;
   1.220 -		partx)
   1.221 -			copy addpart delpart partx resizepart
   1.222 -			CAT="system-tools|partx utilities"
   1.223 -			DEPENDS="glibc-base util-linux-blkid util-linux-uuid \
   1.224 -			util-linux-smartcols"
   1.225 -			;;
   1.226 -		setterm)
   1.227 -			copy setterm
   1.228 -			CAT="base-system|setterm utility"
   1.229 -			DEPENDS="glibc-base ncurses"
   1.230 -			;;
   1.231 -		sfdisk)
   1.232 -			copy sfdisk
   1.233 -			CAT="system-tools|sfdisk utility"
   1.234 -			DEPENDS="glibc-base ncurses readline util-linux-blkid \
   1.235 -			util-linux-fdisk util-linux-smartcols util-linux-uuid"
   1.236 -			;;
   1.237 -		smartcols)
   1.238 -			copy libsmartcols.so*
   1.239 -			CAT="system-tools|smartcols library"
   1.240 -			DEPENDS="glibc-base"
   1.241 -			;;
   1.242 -		smartcols-dev)
   1.243 -			copy libsmartcols.h smartcols.pc
   1.244 -			CAT="development|smartcols library development files"
   1.245 -			DEPENDS="util-linux-smartcols"
   1.246 -			;;
   1.247 -		uuid)
   1.248 -			copy libuuid.so* uuidgen uuidd
   1.249 -			CAT="base-system|uuid utility and library"
   1.250 -			DEPENDS="glibc-base"
   1.251 -			;;
   1.252 -		uuid-dev)
   1.253 -			copy uuid.h uuid.pc
   1.254 -			CAT="development|uuid utility and library development files"
   1.255 -			DEPENDS="util-linux-uuid"
   1.256 -			;;
   1.257 -		whereis)
   1.258 -			copy whereis
   1.259 -			CAT="base-system|whereis utility"
   1.260 -			DEPENDS="glibc-base"
   1.261 -			;;
   1.262 -		misc)
   1.263 -			copy @std @dev @rm
   1.264 -			CAT="system-tools|misc utilities"
   1.265 -			;;
   1.266 -		util-linux)
   1.267 -			TAGS="LFS"
   1.268 -			;;
   1.269 -	esac
   1.270 -
   1.271 -	if [ "$PACKAGE" != 'util-linux-bash-completion' -a -d "$fs/usr/share/bash-completion" ]; then
   1.272 -		rm -r $fs/usr/share/bash-completion
   1.273 -		rmdir --parents --ignore-fail-on-non-empty $fs/usr/share
   1.274 -	fi
   1.275 -}