wok-next rev 19858

Small fixes: dbus, dropbear, libgphoto2, openbox-max, slitaz-configs, tazwikiss, wireless_tools
author Aleksej Bobylev <al.bobylev@gmail.com>
date Fri Sep 08 00:53:11 2017 +0300 (2017-09-08)
parents e64ba2957d77
children 3e53b4794bbf
files dbus/receipt dropbear/receipt libgphoto2/receipt openbox-max/receipt slitaz-configs/receipt tazwikiss/receipt wireless_tools/receipt
line diff
     1.1 --- a/dbus/receipt	Thu Sep 07 23:39:42 2017 +0300
     1.2 +++ b/dbus/receipt	Fri Sep 08 00:53:11 2017 +0300
     1.3 @@ -26,6 +26,7 @@
     1.4  		--disable-static \
     1.5  		--disable-systemd \
     1.6  		--without-systemdsystemunitdir \
     1.7 +		--with-console-auth-dir=/run/console/ \
     1.8  		--docdir=/usr/share/doc/dbus-$VERSION \
     1.9  		$CONFIGURE_ARGS &&
    1.10  	make && make -j1 install
    1.11 @@ -61,7 +62,7 @@
    1.12  	if ! grep -qs 'messagebus' "$1/etc/passwd"; then
    1.13  		action 'Adding user: messagebus...'
    1.14  		chroot "$1/" addgroup -g25 -S messagebus
    1.15 -		chroot "$1/" adduser -h/var/run/dbus -S -D -u25 -G25 \
    1.16 +		chroot "$1/" adduser -h/var/run/dbus -S -D -u25 -G messagebus \
    1.17  			-g"D-Bus Message Daemon User" messagebus
    1.18  		status
    1.19  	fi
     2.1 --- a/dropbear/receipt	Thu Sep 07 23:39:42 2017 +0300
     2.2 +++ b/dropbear/receipt	Fri Sep 08 00:53:11 2017 +0300
     2.3 @@ -116,7 +116,7 @@
     2.4  	grep -q ssh "$1/etc/inetd.conf" || cat >> "$1/etc/inetd.conf" <<EOT
     2.5  #ssh	stream	tcp	nowait	root	dropbear	dropbear	-i -b /etc/dropbear/banner
     2.6  EOT
     2.7 -	[ -z "$quiet" ] || return
     2.8 +	[ -n "$quiet" ] && return
     2.9  	cat <<EOT
    2.10  
    2.11  	.-------------------------------------------------.
     3.1 --- a/libgphoto2/receipt	Thu Sep 07 23:39:42 2017 +0300
     3.2 +++ b/libgphoto2/receipt	Fri Sep 08 00:53:11 2017 +0300
     3.3 @@ -1,4 +1,4 @@
     3.4 -# SliTaz package receipt.
     3.5 +# SliTaz package receipt v2.
     3.6  
     3.7  PACKAGE="libgphoto2"
     3.8  VERSION="2.5.13"
     3.9 @@ -7,16 +7,12 @@
    3.10  MAINTAINER="jozee@slitaz.org"
    3.11  LICENSE="LGPL2.1"
    3.12  WEB_SITE="http://www.gphoto.org/"
    3.13 -TAGS="camera photo"
    3.14  
    3.15  TARBALL="$PACKAGE-$VERSION.tar.bz2"
    3.16  WGET_URL="$SF_MIRROR/gphoto/$TARBALL"
    3.17  
    3.18 -DEPENDS="eudev libexif libjpeg-turbo libltdl liblzma libusb libxml2 zlib"
    3.19 -BUILD_DEPENDS="jpeg-dev libexif-dev libtool libexif jpeg libusb libusb-dev \
    3.20 -libusb-compat libusb-compat-dev pkg-config"
    3.21 -
    3.22  BUILD_DEPENDS="libtool gettext libjpeg-turbo-dev libexif-dev libusb-dev"
    3.23 +SPLIT="libgphoto2-dev"
    3.24  
    3.25  # Rules to configure and make the package.
    3.26  compile_rules()
    3.27 @@ -35,12 +31,22 @@
    3.28  # Rules to gen a SliTaz package suitable for Tazpkg.
    3.29  genpkg_rules()
    3.30  {
    3.31 -	copy *.so* print-camera-list check-ptp-camera konica/ vcamera/
    3.32 -	rm -rf $fs/usr/share/doc	# *.so* files here
    3.33 +	case $PACKAGE in
    3.34 +		libgphoto2)
    3.35 +			copy @std
    3.36 +			DEPENDS="eudev libexif libjpeg-turbo libltdl liblzma libusb \
    3.37 +			libxml2 zlib"
    3.38 +			TAGS="camera photo"
    3.39 +			;;
    3.40 +		libgphoto2-dev)
    3.41 +			copy @dev
    3.42 +			DEPENDS="libgphoto2 eudev-dev libjpeg-turbo-dev libexif-dev \
    3.43 +			libtool libusb-dev libxml2-dev xz-dev zlib"
    3.44 +			;;
    3.45 +	esac
    3.46  }
    3.47  
    3.48 -post_install()
    3.49 -{
    3.50 +post_install_libgphoto2() {
    3.51  	HAL_FDI="$1/usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi"
    3.52  	UDEV_RULE="$1/etc/udev/rules.d/70-libgphoto2.rules"
    3.53  	CAM_LIST="$1/usr/lib/libgphoto2/print-camera-list"
    3.54 @@ -57,7 +63,9 @@
    3.55  	#udev rule
    3.56  	"$CAM_LIST" udev-rules version 0.98 group camera mode 0660 > "$UDEV_RULE"
    3.57  
    3.58 -	tazpkg reconfigure eudev --root="$1"
    3.59 +	[ -z "$1" ] || mount -o bind /dev "$1/dev"
    3.60 +	chroot "$1/" tazpkg reconfigure eudev
    3.61 +	[ -z "$1" ] || umount "$1/dev"
    3.62  
    3.63  	# add group camera
    3.64  	if ! grep -q camera "$1/etc/group"; then
    3.65 @@ -70,7 +78,6 @@
    3.66  EOT
    3.67  }
    3.68  
    3.69 -post_remove()
    3.70 -{
    3.71 +post_remove_libgphoto2() {
    3.72  	chroot "$1/" delgroup camera
    3.73  }
     4.1 --- a/openbox-max/receipt	Thu Sep 07 23:39:42 2017 +0300
     4.2 +++ b/openbox-max/receipt	Fri Sep 08 00:53:11 2017 +0300
     4.3 @@ -50,6 +50,6 @@
     4.4  }
     4.5  
     4.6  pre_install() {
     4.7 -	[ -d "$1/var/lib/tazpkg/installed/openbox" ] &&
     4.8 +	[ ! -d "$1/var/lib/tazpkg/installed/openbox" ] ||
     4.9  		tazpkg -r openbox --root="$1/"
    4.10  }
     5.1 --- a/slitaz-configs/receipt	Thu Sep 07 23:39:42 2017 +0300
     5.2 +++ b/slitaz-configs/receipt	Fri Sep 08 00:53:11 2017 +0300
     5.3 @@ -147,7 +147,7 @@
     5.4  	chroot "$1/" slim-theme -f slitaz
     5.5  }
     5.6  
     5.7 -post_install_slitaz_configs_base() {
     5.8 +post_install_slitaz_configs() {
     5.9  	for i in $(ls -d "$1/root" "$1"/home/* 2>/dev/null); do
    5.10  		[ -d "$i" ] && cp -f "$1/etc/skel/.xinitrc" "$i"
    5.11  	done
     6.1 --- a/tazwikiss/receipt	Thu Sep 07 23:39:42 2017 +0300
     6.2 +++ b/tazwikiss/receipt	Fri Sep 08 00:53:11 2017 +0300
     6.3 @@ -104,5 +104,6 @@
     6.4  		fi
     6.5  	fi
     6.6  
     6.7 -	[ -z "$quiet" ] && echo -e "The default password to edit pages is 'test'\n"
     6.8 +	[ -n "$quiet" ] && return
     6.9 +	echo -e "The default password to edit pages is 'test'\n"
    6.10  }
     7.1 --- a/wireless_tools/receipt	Thu Sep 07 23:39:42 2017 +0300
     7.2 +++ b/wireless_tools/receipt	Fri Sep 08 00:53:11 2017 +0300
     7.3 @@ -35,7 +35,8 @@
     7.4  
     7.5  post_install_wireless_tools()
     7.6  {
     7.7 -	[ -z "$quiet" ] && cat <<EOT
     7.8 +	[ -n "$quiet" ] && return
     7.9 +	cat <<EOT
    7.10  You may need to install linux-wireless to have wireless network drivers.
    7.11  Or install tazndis to use Windows drivers.
    7.12  EOT