wok-next rev 19852

Up eudev, lxsession, util-linux
author Aleksej Bobylev <al.bobylev@gmail.com>
date Fri Sep 01 13:09:05 2017 +0300 (2017-09-01)
parents f22b926e527d
children d57d8c4514f4
files eudev/receipt lxsession/receipt util-linux/receipt
line diff
     1.1 --- a/eudev/receipt	Thu Aug 31 09:34:08 2017 +0300
     1.2 +++ b/eudev/receipt	Fri Sep 01 13:09:05 2017 +0300
     1.3 @@ -78,13 +78,13 @@
     1.4  	[ -e "$1/lib/udev/devices/null" ] || mknod -m 0666 "$1/lib/udev/devices/null" c 1 3
     1.5  
     1.6  	# Sanity check for udev+ldap boot
     1.7 -	grep GROUP "$1"/etc/udev/rules.d/* | \
     1.8 +	grep GROUP "$1"/etc/udev/rules.d/* "$1"/lib/udev/rules.d/* 2>/dev/null | \
     1.9  	sed 's/.*GROUP="\([a-zA-Z0-9]*\)".*/\1/' | sort | uniq | \
    1.10  	while read x ; do
    1.11  		grep -q ^$x: "$1/etc/group" || chroot "$1/" addgroup -S $x
    1.12  	done
    1.13  
    1.14 -	grep OWNER "$1"/etc/udev/rules.d/* | \
    1.15 +	grep OWNER "$1"/etc/udev/rules.d/* "$1"/lib/udev/rules.d/* 2>/dev/null | \
    1.16  	sed 's/.*OWNER="\([a-zA-Z0-9]*\)".*/\1/' | sort | uniq | \
    1.17  	while read x ; do
    1.18  		grep -q ^$x: "$1/etc/passwd" || chroot "$1/" adduser -S -D -H $x
     2.1 --- a/lxsession/receipt	Thu Aug 31 09:34:08 2017 +0300
     2.2 +++ b/lxsession/receipt	Fri Sep 01 13:09:05 2017 +0300
     2.3 @@ -3,10 +3,10 @@
     2.4  PACKAGE="lxsession"
     2.5  VERSION="0.5.3"
     2.6  CATEGORY="x-window"
     2.7 -SHORT_DESC="LXDE X session manager"
     2.8 +SHORT_DESC="Standard session manager used by LXDE"
     2.9  MAINTAINER="pankso@slitaz.org"
    2.10  LICENSE="GPL2"
    2.11 -WEB_SITE="http://wiki.lxde.org/en/LXSession"
    2.12 +WEB_SITE="https://wiki.lxde.org/en/LXSession"
    2.13  HOST_ARCH="i486 arm"
    2.14  
    2.15  TARBALL="$PACKAGE-$VERSION.tar.xz"
    2.16 @@ -25,16 +25,15 @@
    2.17  	rm *.stamp
    2.18  	autoreconf -fi
    2.19  
    2.20 -	# Additional keys: --enable-buildin-clipboard, --enable-buildin-polkit
    2.21  	./configure \
    2.22  		--sysconfdir=/etc \
    2.23 -		--enable-buildin-clipboard \
    2.24  		$CONFIGURE_ARGS &&
    2.25 -	make && make install || exit 1
    2.26 +	make && make install || return 1
    2.27  
    2.28  	# customize desktop.conf for SliTaz
    2.29 -	mkdir -p $install/etc/xdg/lxsession/LXDE/
    2.30 -	cp $src/data/desktop.conf.example $install/etc/xdg/lxsession/LXDE/desktop.conf
    2.31 +	confdir="$install/etc/xdg/lxsession/LXDE"
    2.32 +	mkdir -p $confdir
    2.33 +	cp $src/data/desktop.conf.example $confdir/desktop.conf
    2.34  	sed -i '
    2.35  		s|^\(terminal_manager/command\).*|\1=terminal|;
    2.36  		s|^\(launcher_manager/command\).*|\1=lxpanelctl|;
    2.37 @@ -45,11 +44,17 @@
    2.38  		s|^\(sGtk/FontName\).*|\1=DejaVu Sans 10|;
    2.39  		s|^#*\(iGtk/ToolbarIconSize\).*|\1=2|;
    2.40  		s|^#*\(sGtk/CursorThemeName\).*|\1=slitaz-polar|;
    2.41 -		' $install/etc/xdg/lxsession/LXDE/desktop.conf
    2.42 +		' $confdir/desktop.conf
    2.43  
    2.44  	# change icon
    2.45  	sed -i 's|^Icon=.*$|Icon=session-properties|' \
    2.46  		$install/usr/share/applications/lxsession-edit.desktop
    2.47 +
    2.48 +	# config files examples
    2.49 +	cp data/*.example $confdir
    2.50 +
    2.51 +	# LXDE autostart dir
    2.52 +	mkdir -p $confdir/autostart
    2.53  }
    2.54  
    2.55  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.56 @@ -59,4 +64,6 @@
    2.57  	DEPENDS="atk cairo fontconfig freetype gdk-pixbuf glib gtk+ pango polkit \
    2.58  	xorg-libX11   dbus-glib lsb-release"
    2.59  	PROVIDE="lxsession-edit"
    2.60 +	CONFIG_FILES="/etc/xdg/lxsession/LXDE/desktop.conf \
    2.61 +	/etc/xdg/lxsession/LXDE/conffiles.conf"
    2.62  }
     3.1 --- a/util-linux/receipt	Thu Aug 31 09:34:08 2017 +0300
     3.2 +++ b/util-linux/receipt	Fri Sep 01 13:09:05 2017 +0300
     3.3 @@ -183,11 +183,7 @@
     3.4  			;;
     3.5  		misc)
     3.6  			copy @std @dev
     3.7 -			for i in $taz/*/files.list; do
     3.8 -				while read j; do
     3.9 -					rm $fs$j; rmdir $fs$(basename $j)
    3.10 -				done < $i
    3.11 -			done 2>/dev/null
    3.12 +			remove_already_packed
    3.13  			CAT="system-tools|misc utilities"
    3.14  			;;
    3.15  	esac