# HG changeset patch # User Aleksej Bobylev # Date 1450659189 -7200 # Node ID d6ca18366f4121d446b000ec4fc78b73ea05c6c1 # Parent b685a2174a02fcc79fc7a95992889f74525a0c73 Remove redundant messages in {pre|post}_{install|remove}() in random packages diff -r b685a2174a02 -r d6ca18366f41 clamav/receipt --- a/clamav/receipt Mon Dec 21 01:46:18 2015 +0200 +++ b/clamav/receipt Mon Dec 21 02:53:09 2015 +0200 @@ -21,7 +21,6 @@ # Have to create clamav user/group to be able to compile adduser -s /bin/false -H -D -u 64 clamav - cd $src ./configure \ --prefix=/usr \ --sysconfdir=/etc/clamav \ @@ -47,7 +46,7 @@ cp -a $install/usr/lib/*.so* $fs/usr/lib # Copy daemon from /$stuff cp $stuff/daemon-clamd $fs/etc/init.d/clamd - + # Customize config sed -i -e "s/^Example/#Example/" \ -e "s|^#LogFile /tmp/clamd.log|LogFile /var/log/clamav/clamav.log|" \ @@ -59,24 +58,18 @@ post_install() { - - local user - local group - - user=clamav - group=clamav - - echo "Processing post-install commands..." - + local user=clamav + local group=clamav + # Enable freshclam update - echo -n "Enabling freshclam update..." + echo; action 'Enabling freshclam update...' cd "$1/etc/clamav" - sed -i 's/^Example/#Example/' freshclam.conf + sed -i 's/^Example/#Example/' freshclam.conf status # adduser clamav if needed if ! grep -q "${user}:" "$1/etc/passwd"; then - echo -n "Adding user/group $user..." + action 'Adding user/group $user...' chroot "$1/" addgroup -S $group chroot "$1/" adduser -s /bin/false -S -D -H -G $group $user status @@ -84,15 +77,14 @@ # Enable daily.cvd updates (sometimes needed for new version) #chown -R ${user}:${group} "$1/var/lib/clamav" - + # Fix perms chroot "$1/" chown -R ${user}.${group} /var/log/clamav \ /run/clamav /var/lib/clamav - } # Del user clamav when pkg is removed. post_remove() { - chroot "$1/" deluser clamav + chroot "$1/" deluser clamav } diff -r b685a2174a02 -r d6ca18366f41 coreutils-conditions/receipt --- a/coreutils-conditions/receipt Mon Dec 21 01:46:18 2015 +0200 +++ b/coreutils-conditions/receipt Mon Dec 21 02:53:09 2015 +0200 @@ -29,18 +29,6 @@ cp -a $install/usr/bin/expr $fs/usr/bin } -# Pre and post install commands for Tazpkg. -# We must remove all Busybox symlink before installing. -# -pre_install() -{ - echo "Processing pre-install commands..." - echo -n "Removing all Busybox replaced utils... " - rm -f "$1/bin/false" "$1/bin/true" - rm -f "$1/usr/bin/test" "$1/usr/bin/[" "$1/usr/bin/expr" - status -} - post_remove() { ln -s /bin/busybox "$1/bin/false" diff -r b685a2174a02 -r d6ca18366f41 coreutils-context-user/receipt --- a/coreutils-context-user/receipt Mon Dec 21 01:46:18 2015 +0200 +++ b/coreutils-context-user/receipt Mon Dec 21 02:53:09 2015 +0200 @@ -31,18 +31,6 @@ cp -a $install/usr/bin/who $fs/usr/bin } -# Pre and post install commands for Tazpkg. -# We must remove all Busybox symlink before installing. -# -pre_install() -{ - echo "Processing pre-install commands..." - echo -n "Removing all Busybox replaced utils... " - rm -f "$1/bin/id" - rm -f "$1/usr/bin/logname" "$1/usr/bin/whoami" "$1/usr/bin/who" - status -} - post_remove() { ln -s /bin/busybox "$1/bin/id" diff -r b685a2174a02 -r d6ca18366f41 coreutils-file-format/receipt --- a/coreutils-file-format/receipt Mon Dec 21 01:46:18 2015 +0200 +++ b/coreutils-file-format/receipt Mon Dec 21 02:53:09 2015 +0200 @@ -25,17 +25,6 @@ cp -a $install/usr/bin/fold $fs/usr/bin } -# Pre and post install commands for Tazpkg. -# We must remove all Busybox symlink before installing. -# -pre_install() -{ - echo "Processing pre-install commands..." - echo -n "Removing all Busybox replaced utils... " - rm -f "$root/usr/bin/fold" - status -} - post_remove() { ln -s /bin/busybox "$1/usr/bin/fold" diff -r b685a2174a02 -r d6ca18366f41 coreutils-file-output-full/receipt --- a/coreutils-file-output-full/receipt Mon Dec 21 01:46:18 2015 +0200 +++ b/coreutils-file-output-full/receipt Mon Dec 21 02:53:09 2015 +0200 @@ -29,17 +29,6 @@ cp -a $install/usr/bin/base64 $fs/usr/bin } -# Pre and post install commands for Tazpkg. -# We must remove all Busybox symlink before installing. -# -pre_install() -{ - echo "Processing pre-install commands..." - echo -n "Removing all Busybox replaced utils... " - rm -f "$1/bin/cat" "$1/usr/bin/od" "$1/usr/bin/tac" - status -} - post_remove() { ln -s /bin/busybox "$1/bin/cat" diff -r b685a2174a02 -r d6ca18366f41 coreutils-file-output-part/receipt --- a/coreutils-file-output-part/receipt Mon Dec 21 01:46:18 2015 +0200 +++ b/coreutils-file-output-part/receipt Mon Dec 21 02:53:09 2015 +0200 @@ -26,17 +26,6 @@ cp -a $install/usr/bin/csplit $fs/usr/bin } -# Pre and post install commands for Tazpkg. -# We must remove all Busybox symlink before installing. -# -pre_install() -{ - echo "Processing pre-install commands..." - echo -n "Removing all Busybox replaced utils... " - rm -f "$1/usr/bin/head" "$1/usr/bin/tail" "$1/usr/bin/split" - status -} - post_remove() { ln -s /bin/busybox "$1/usr/bin/head" diff -r b685a2174a02 -r d6ca18366f41 coreutils-line/receipt --- a/coreutils-line/receipt Mon Dec 21 01:46:18 2015 +0200 +++ b/coreutils-line/receipt Mon Dec 21 02:53:09 2015 +0200 @@ -25,17 +25,6 @@ cp -a $install/usr/bin/join $fs/usr/bin } -# Pre and post install commands for Tazpkg. -# We must remove all Busybox symlink before installing. -# -pre_install() -{ - echo "Processing pre-install commands..." - echo -n "Removing all Busybox replaced utils... " - rm -f "$1/usr/bin/cut" - status -} - post_remove() { ln -s /bin/busybox "$1/usr/bin/cut" diff -r b685a2174a02 -r d6ca18366f41 coreutils-path/receipt --- a/coreutils-path/receipt Mon Dec 21 01:46:18 2015 +0200 +++ b/coreutils-path/receipt Mon Dec 21 02:53:09 2015 +0200 @@ -25,17 +25,6 @@ cp -a $install/usr/bin/pathchk $fs/usr/bin } -# Pre and post install commands for Tazpkg. -# We must remove all Busybox symlink before installing. -# -pre_install() -{ - echo "Processing pre-install commands..." - echo -n "Removing all Busybox replaced utils... " - rm -f "$1/usr/bin/basename" "$1/usr/bin/dirname" - status -} - post_remove() { ln -s /bin/busybox "$1/usr/bin/basename" diff -r b685a2174a02 -r d6ca18366f41 coreutils-redirection/receipt --- a/coreutils-redirection/receipt Mon Dec 21 01:46:18 2015 +0200 +++ b/coreutils-redirection/receipt Mon Dec 21 02:53:09 2015 +0200 @@ -23,17 +23,6 @@ cp -a $install/usr/bin/tee $fs/usr/bin } -# Pre and post install commands for Tazpkg. -# We must remove all Busybox symlink before installing. -# -pre_install() -{ - echo "Processing pre-install commands..." - echo -n "Removing all Busybox replaced utils... " - rm -f "$1/usr/bin/tee" - status -} - post_remove() { ln -s /bin/busybox "$1/usr/bin/tee" diff -r b685a2174a02 -r d6ca18366f41 coreutils/receipt --- a/coreutils/receipt Mon Dec 21 01:46:18 2015 +0200 +++ b/coreutils/receipt Mon Dec 21 02:53:09 2015 +0200 @@ -16,8 +16,6 @@ # Rules to configure and make the package. compile_rules() { - cd $src - # NOTE: There does not seem to be a problem with sigcontext.h in Linux 2.6.29.3 # Hack to fix ls: expected specifier-qualifier-list before '__u64' @@ -38,7 +36,7 @@ sed -i 's/1.10a/1.10.2/' configure.ac || return 1 sed -i 's/dist-xz/dist-lzma/' configure.ac || return 1 - ./configure $CONFIGURE_ARGS && + ./configure $CONFIGURE_ARGS && make && make install # Restore original sigcontext.h @@ -71,24 +69,10 @@ cp -a $install/usr/bin/cp $fs/usr/bin } -# Pre and post install commands for Tazpkg. -# We must remove all Busybox symlink but cp before installing. -# -pre_install() -{ - echo "Processing pre-install commands..." - # we keed busybox cp for installing the pkg - echo -n "Removing Busybox replaced utils... " - rm -f "$1/usr/bin/od" "$1/usr/bin/split" - status -} - post_install() { - echo -n "Installing cp..." rm "$1/bin/cp" && mv "$1/usr/bin/cp" "$1/bin" - status } post_remove() diff -r b685a2174a02 -r d6ca18366f41 couchdb/receipt --- a/couchdb/receipt Mon Dec 21 01:46:18 2015 +0200 +++ b/couchdb/receipt Mon Dec 21 02:53:09 2015 +0200 @@ -18,7 +18,6 @@ # Rules to configure and make the package. compile_rules() { - cd $src ./configure \ --prefix=/usr \ --sysconfdir=/etc \ @@ -52,9 +51,7 @@ pre_install() { INIT_FILE="/etc/init.d/$PACKAGE" - echo "Processing pre-install commands..." [ -f "$1$INIT_FILE" ] && chroot "$1/" $INIT_FILE stop - echo "Done..." } # Post install commands for tazpkg @@ -66,8 +63,6 @@ LOGDIR="/var/log/$PACKAGE" RUNDIR="/var/run/$PACKAGE" - echo "Processing post-install commands..." - grep -q "$PACKAGE" "$1/etc/group" || chroot "$1/" addgroup -S $PACKAGE grep -q "$PACKAGE" "$1/etc/passwd" || chroot "$1/" adduser -S -D -H \ @@ -77,17 +72,13 @@ chroot "$1/" chown -R $PACKAGE:$PACKAGE $DIR && chroot "$1/" chmod -R 0770 $DIR done - - echo "Done..." } # Pre and post remove commands for Tazpkg. pre_remove() { INIT_FILE="/etc/init.d/$PACKAGE" - echo "Processing pre-remove commands..." [ -f "$1$INIT_FILE" ] && chroot "$1/" $INIT_FILE stop - echo "Done..." } post_remove() @@ -97,13 +88,9 @@ LOGDIR="/var/log/$PACKAGE" RUNDIR="/var/run/$PACKAGE" - echo "Processing post-remove commands..." - chroot "$1/" deluser $PACKAGE for DIR in $LIBDIR $ETCDIR $LOGDIR $RUNDIR; do rm -rf "$1$DIR" done - - echo "Done..." } diff -r b685a2174a02 -r d6ca18366f41 docbook-xsl-ns/receipt --- a/docbook-xsl-ns/receipt Mon Dec 21 01:46:18 2015 +0200 +++ b/docbook-xsl-ns/receipt Mon Dec 21 02:53:09 2015 +0200 @@ -15,15 +15,14 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - cd $src pkgroot=$fs/usr/share/xml/docbook/stylesheet/$PACKAGE install -dm755 $pkgroot/common install -dm755 $pkgroot/params - + for fn in xml xsl dtd ent; do install -m644 common/*.${fn} $pkgroot/common/ done - + for fn in fo highlighting html roundtrip; do install -dm755 ${pkgroot}/${fn} install -m644 ${fn}/*.xml ${pkgroot}/${fn}/ @@ -39,16 +38,15 @@ # Pre and post install commands for Tazpkg. post_install() { - echo -n "Processing post-install commands..." if [ "$1" ]; then - mv -f "$1/etc/resolv.conf" "$1/etc/recolv.conf.$$" 2> /dev/null + mv -f "$1/etc/resolv.conf" "$1/etc/recolv.conf.$$" 2>/dev/null cp /etc/resolv.conf "$1/etc/resolv.conf" fi # Create a /etc/xml/catalog file if [ ! -d "$1/etc/xml" ]; then install -v -m755 -d "$1/etc/xml"; fi && if [ ! -f "$1/etc/xml/catalog" ]; then - chroot "$1/" xmlcatalog --noout --create /etc/xml/catalog + chroot "$1/" xmlcatalog --noout --create /etc/xml/catalog fi && chroot "$1/" xmlcatalog --noout --add "rewriteSystem" \ @@ -70,9 +68,8 @@ "http://docbook.sourceforge.net/release/xsl-ns/current" \ "/usr/share/xml/docbook/stylesheet/$PACKAGE/catalog.xml" \ /etc/xml/catalog - status + if [ "$1" ]; then - mv -f "$1/etc/resolv.conf.$$" "$1/etc/recolv.conf" 2> /dev/null + mv -f "$1/etc/resolv.conf.$$" "$1/etc/recolv.conf" 2>/dev/null fi } - diff -r b685a2174a02 -r d6ca18366f41 eom/receipt --- a/eom/receipt Mon Dec 21 01:46:18 2015 +0200 +++ b/eom/receipt Mon Dec 21 02:53:09 2015 +0200 @@ -38,15 +38,3 @@ cp -a $install/usr/share/glib-2.0 $fs/usr/share cp -a $install/usr/share/MateConf $fs/usr/share } - -post_install() -{ - echo "Processing post-install commands..." - chroot "$1/" /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas -} - -post_remove() -{ - echo "Processing post-remove commands..." - chroot "$1/" /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas -} diff -r b685a2174a02 -r d6ca18366f41 evince/receipt --- a/evince/receipt Mon Dec 21 01:46:18 2015 +0200 +++ b/evince/receipt Mon Dec 21 02:53:09 2015 +0200 @@ -41,26 +41,13 @@ cp -a $install/usr/bin $fs/usr cp -a $install/usr/lib/*.so* $fs/usr/lib cp -a $install/usr/lib/evince $fs/usr/lib - + cp -a $install/usr/share/dbus-1 $fs/usr/share cp -a $install/usr/share/icons $fs/usr/share cp -a $install/usr/share/evince $fs/usr/share cp -a $install/usr/share/glib-2.0/schemas $fs/usr/share/glib-2.0 cp -a $stuff/evince.desktop $fs/usr/share/applications - + # Removing unwanted files find $fs/usr/lib -name "*.*a" -exec rm -rf {} \; } - -# Post install/remove commands for Tazpkg. -post_install() -{ - echo "Processing post-install commands..." - chroot "$1/" /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas -} - -post_remove() -{ - echo "Processing post-remove commands..." - chroot "$1/" /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas -} diff -r b685a2174a02 -r d6ca18366f41 fpc/receipt --- a/fpc/receipt Mon Dec 21 01:46:18 2015 +0200 +++ b/fpc/receipt Mon Dec 21 02:53:09 2015 +0200 @@ -41,7 +41,7 @@ BINUTILSPREFIX=arm-slitaz-gnueabi- \ INSTALL_PREFIX=$DESTDIR/usr ;; esac && - + # install package license install -m 755 -d $DESTDIR/usr/share/licenses/fpc && install -m 644 $src/fpcsrc/rtl/COPYING.FPC \ @@ -54,10 +54,10 @@ mkdir -p $fs/usr $fs/etc cp -a $install/usr/bin $fs/usr cp -a $install/usr/lib $fs/usr - + # create symlink for compiler ln -s /usr/lib/$PACKAGE/$VERSION/ppc386 $fs/usr/bin - + # config file #mkdir -p $fs/etc #cp -a $fs/usr/lib/fpc/$VERSION/samplecfg $fs/etc/fpc.cfg @@ -65,14 +65,12 @@ post_install() { - echo"Processing postinstall commands..." if [ ! -f "$1/etc/fpc.cfg" ]; then chroot "$1/" fpcmkcfg > /etc/fpc.cfg fi - + # Fix units search path sed -i -e 's!^-Fu/units/$fpctarget!-Fu/usr/lib/fpc/'$VERSION'/units/$fpctarget!' \ -e 's!^-Fu/units/$fpctarget/*!-Fu/usr/lib/fpc/'$VERSION'/units/$fpctarget/*!' \ -e 's!^-Fu/units/$fpctarget/rtl!-Fu/usr/lib/fpc/'$VERSION'/units/$fpctarget/rtl!' "$1/etc/fpc.cfg" - } diff -r b685a2174a02 -r d6ca18366f41 gcc+gcj/receipt --- a/gcc+gcj/receipt Mon Dec 21 01:46:18 2015 +0200 +++ b/gcc+gcj/receipt Mon Dec 21 02:53:09 2015 +0200 @@ -26,7 +26,6 @@ # Rules to configure and make the package. compile_rules() { - cd $src sed -i 's/@mkdir_p@/mkdir -p/' libjava/classpath/lib/copy-vmresources.sh.in # Set HOST_SYSTEM if not defined in tazwok.conf as it should be if [ -z "$HOST_SYSTEM" ] ; then @@ -52,10 +51,10 @@ # Use libiberty.a from binutils. sed -i 's/install_to_$(INSTALL_DEST) //' \ $src/libiberty/Makefile.in || return 1 - mkdir -p ../build && cd ../build + mkdir -p ../build && cd ../build - PYTHON_LIB=python$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/') - ../${src##*/}/configure --prefix=/usr --libexecdir=/usr/lib \ + PYTHON_LIB=python$(grep ^VERSION= $WOK/python/receipt | sed 's/.*"\(...\).*/\1/') + ../${src##*/}/configure --prefix=/usr --libexecdir=/usr/lib \ --infodir=/usr/share/info --mandir=/usr/share/man --enable-nls \ --enable-languages=c,c++,objc,java --enable-shared \ --with-system-zlib \ @@ -69,10 +68,10 @@ --enable-gtk-cairo \ --enable-lto \ $CONFIGURE_ARGS $GCC_TARGET && - make bootstrap && - # Make install in the source tree to help creating derived pkgs - # and keep $_pkg variable set for genpkg. - make install + make bootstrap && + # Make install in the source tree to help creating derived pkgs + # and keep $_pkg variable set for genpkg. + make install } # Rules to gen a SliTaz package suitable for Tazpkg. @@ -80,23 +79,22 @@ { mkdir -p $fs/usr/share cp -a $install/usr/share/java $fs/usr/share - cp -a $install/usr/bin $fs/usr - # Copy all libs. Remove libgcc_s.so and libstdc++.so - # they goes in gcc-lib-base-$VERSION package. - cp -a $install/usr/lib $fs/usr - rm $fs/usr/lib/libgcc_s.so* - rm $fs/usr/lib/libstdc++.so* - rm $fs/usr/lib/libgomp.so* - #rm $fs/usr/lib/gcj-$VERSION-11/*.la - rm $fs/usr/lib/*.la - # Include files. - cp -a $install/usr/include $fs/usr + cp -a $install/usr/bin $fs/usr + # Copy all libs. Remove libgcc_s.so and libstdc++.so + # they goes in gcc-lib-base-$VERSION package. + cp -a $install/usr/lib $fs/usr + rm $fs/usr/lib/libgcc_s.so* + rm $fs/usr/lib/libstdc++.so* + rm $fs/usr/lib/libgomp.so* + #rm $fs/usr/lib/gcj-$VERSION-11/*.la + rm $fs/usr/lib/*.la + # Include files. + cp -a $install/usr/include $fs/usr } # Post install commands for Tazpkg. post_install() { - echo "Processing post-install commands..." if [ ! -f "$1/lib/cpp" ] ; then ln -s ../usr/bin/cpp "$1/lib" fi diff -r b685a2174a02 -r d6ca18366f41 gcc/receipt --- a/gcc/receipt Mon Dec 21 01:46:18 2015 +0200 +++ b/gcc/receipt Mon Dec 21 02:53:09 2015 +0200 @@ -118,7 +118,6 @@ # Post install commands for Tazpkg. post_install() { - echo "Processing post-install commands..." [ -f "$1/lib/cpp" ] || ln -s ../usr/bin/cpp "$1/lib" [ -f "$1/usr/bin/cc" ] || diff -r b685a2174a02 -r d6ca18366f41 gecko-mediaplayer/receipt --- a/gecko-mediaplayer/receipt Mon Dec 21 01:46:18 2015 +0200 +++ b/gecko-mediaplayer/receipt Mon Dec 21 02:53:09 2015 +0200 @@ -7,17 +7,16 @@ MAINTAINER="jozee@slitaz.org" LICENSE="GPL2" TARBALL="$PACKAGE-$VERSION.tar.gz" -WEB_SITE="http://code.google.com/p/gecko-mediaplayer/" +WEB_SITE="http://code.google.com/p/gecko-mediaplayer/" WGET_URL="http://gecko-mediaplayer.googlecode.com/files/$TARBALL" TAGS="player audio video browser" DEPENDS="gnome-mplayer dbus-glib gcc-lib-base" BUILD_DEPENDS="firefox-dev dbus-dev dbus-glib-dev nspr-dev" - + # Rules to configure and make the package. compile_rules() { - cd $src sed -i 's/utf8characters/UTF8Characters/g' src/*.cpp sed -i 's|NPP_Initialize|//&|' src/np_entry.cpp sed -i 's|char[\*\) ]*NP*_GetMIMEDescription(|const &|' src/npupp.h \ @@ -30,7 +29,6 @@ $CONFIGURE_ARGS && make && make DESTDIR=$DESTDIR install - } # Rules to gen a SliTaz package suitable for Tazpkg. @@ -38,21 +36,16 @@ { mkdir -p $fs/usr/lib cp -a $install/usr/lib/mozilla $fs/usr/lib - } post_install() { - echo -n "Processing post install commands..." for i in "$1"/usr/lib/mozilla/plugins/$PACKAGE*.so ; do ln -s "$i" "$1"/usr/lib/firefox*/plugins - done - status + done } post_remove() { - echo -n "Processing post remove commands..." rm -f /usr/lib/firefox*/plugins/$PACKAGE*.so - status } diff -r b685a2174a02 -r d6ca18366f41 gnu-netcat/receipt --- a/gnu-netcat/receipt Mon Dec 21 01:46:18 2015 +0200 +++ b/gnu-netcat/receipt Mon Dec 21 02:53:09 2015 +0200 @@ -16,7 +16,6 @@ # Rules to configure and make the package. compile_rules() { - cd $src ./configure --mandir=/usr/share/man \ --infodir=/usr/share/info \ $CONFIGURE_ARGS && @@ -30,18 +29,7 @@ cp -a $install/usr/bin $fs/usr } -# Pre and post install commands for Tazpkg. -# We must remove all Busybox symlink before installing. -# -pre_install() -{ - echo "Processing pre-install commands..." - echo -n "Removing all Busybox replaced utils... " - rm -f "$1/usr/bin/nc" - status -} - post_remove() { ln -s /bin/busybox "$1/usr/bin/nc" -} \ No newline at end of file +} diff -r b685a2174a02 -r d6ca18366f41 gnucash/receipt --- a/gnucash/receipt Mon Dec 21 01:46:18 2015 +0200 +++ b/gnucash/receipt Mon Dec 21 02:53:09 2015 +0200 @@ -64,16 +64,3 @@ cp -a $install/usr/share/locale/$locale $fs/usr/share/locale done } - -# Post install/remove commands for Tazpkg. -post_install() -{ - echo "Processing post-install commands..." - chroot "$1/" /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas -} - -post_remove() -{ - echo "Processing post-remove commands..." - chroot "$1/" /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas -} diff -r b685a2174a02 -r d6ca18366f41 hd2u/receipt --- a/hd2u/receipt Mon Dec 21 01:46:18 2015 +0200 +++ b/hd2u/receipt Mon Dec 21 02:53:09 2015 +0200 @@ -16,7 +16,6 @@ # Rules to configure and make the package. compile_rules() { - cd $src ./configure \ --prefix=/usr \ --infodir=/usr/share/info \ @@ -32,18 +31,7 @@ cp -a $install/usr/bin $fs/usr } -# Pre and post install commands for Tazpkg. -# We must remove all Busybox symlink before installing. -# -pre_install() -{ - echo "Processing pre-install commands..." - echo -n "Removing all Busybox replaced utils... " - rm -f "$1/usr/bin/dos2unix" - status -} - post_remove() { ln -s /bin/busybox "$1/usr/bin/dos2unix" -} \ No newline at end of file +} diff -r b685a2174a02 -r d6ca18366f41 less/receipt --- a/less/receipt Mon Dec 21 01:46:18 2015 +0200 +++ b/less/receipt Mon Dec 21 02:53:09 2015 +0200 @@ -16,7 +16,6 @@ # Rules to configure and make the package. compile_rules() { - cd $src ./configure \ --prefix=/usr \ --sysconfdir=/etc \ @@ -33,17 +32,6 @@ cp -a $install/usr/bin $fs/usr } -# Pre and post install commands for Tazpkg. -# We must remove all Busybox symlink before installing. -# -pre_install() -{ - echo "Processing pre-install commands..." - echo -n "Removing all Busybox replaced utils... " - rm -f "$1/usr/bin/less" - status -} - post_remove() { ln -s /bin/busybox "$1/usr/bin/less" diff -r b685a2174a02 -r d6ca18366f41 lighttpd-ssl/receipt --- a/lighttpd-ssl/receipt Mon Dec 21 01:46:18 2015 +0200 +++ b/lighttpd-ssl/receipt Mon Dec 21 02:53:09 2015 +0200 @@ -39,9 +39,9 @@ --disable-ipv6 \ --with-openssl \ --prefix=/usr \ - --libdir=/usr/lib/lighttpd \ - --mandir=/usr/share/man \ - $CONFIGURE_ARGS && + --libdir=/usr/lib/lighttpd \ + --mandir=/usr/share/man \ + $CONFIGURE_ARGS && make && make DESTDIR=$DESTDIR install } @@ -56,10 +56,10 @@ # Modules. mkdir -p $fs/usr/lib/lighttpd - for module in $BASE_MODULES - do + for module in $BASE_MODULES; do + action 'Copying : mod_${module}.so' cp $install/usr/lib/lighttpd/mod_${module}.so $fs/usr/lib/lighttpd - echo -n "Copying : mod_${module}.so" && status + status done # Server root and config file. @@ -95,13 +95,11 @@ # We stop the server by default in case of upgarde. pre_install() { - echo "Processing pre-install commands..." [ -f /etc/init.d/lighttpd ] && /etc/init.d/lighttpd stop } post_install() { - echo "Processing post-install commands..." if [ ! -f "$1/etc/ssl/lighttpd/lighttpd.pem" ]; then openssl req -new -x509 \ -keyout "$1/etc/ssl/lighttpd/lighttpd.pem" \ diff -r b685a2174a02 -r d6ca18366f41 linux/receipt --- a/linux/receipt Mon Dec 21 01:46:18 2015 +0200 +++ b/linux/receipt Mon Dec 21 02:53:09 2015 +0200 @@ -348,43 +348,42 @@ return 0 ;; esac - export PACKAGE VERSION - local path - cp -a $install/boot $fs - - # Compress all modules. - path=$fs/lib/modules/$VERSION-slitaz/kernel - mkdir -p $path - - # Get the base modules - export src install - mkdir -p $WOK/$PACKAGE/source/tmp - # Warning stuff/list_modules.sh must find the generated modules.list - $stuff/list_modules.sh \ + export PACKAGE VERSION + local path + cp -a $install/boot $fs + + # Compress all modules. + path=$fs/lib/modules/$VERSION-slitaz/kernel + mkdir -p $path + + # Get the base modules + export src install + mkdir -p $WOK/$PACKAGE/source/tmp + # Warning stuff/list_modules.sh must find the generated modules.list + $stuff/list_modules.sh \ $(cat $stuff/modules.list) > $WOK/$PACKAGE/source/tmp/modules.list - while read module; do - dir=$(dirname $module) - [ -d $path/$dir ] || mkdir -p $path/$dir - cp -a $install/lib/modules/$VERSION-slitaz/kernel/$module $path/$dir - done < $WOK/$PACKAGE/source/tmp/modules.list - - # Remove unresolved links - rm -f $fs/lib/modules/$VERSION-slitaz/build - rm -f $fs/lib/modules/$VERSION-slitaz/source - - # We only need module.{order,builtin} because other map files are - # generated by depmod in post_install - cp -a $install/lib/modules/$VERSION-slitaz/modules.order \ + while read module; do + dir=$(dirname $module) + [ -d $path/$dir ] || mkdir -p $path/$dir + cp -a $install/lib/modules/$VERSION-slitaz/kernel/$module $path/$dir + done < $WOK/$PACKAGE/source/tmp/modules.list + + # Remove unresolved links + rm -f $fs/lib/modules/$VERSION-slitaz/build + rm -f $fs/lib/modules/$VERSION-slitaz/source + + # We only need module.{order,builtin} because other map files are + # generated by depmod in post_install + cp -a $install/lib/modules/$VERSION-slitaz/modules.order \ $install/lib/modules/$VERSION-slitaz/modules.builtin \ $fs/lib/modules/$VERSION-slitaz - - # Pack all packages with a kernel module - for i in $(cd $WOK; grep -l '^WANTED="linux"' */receipt) - do + + # Pack all packages with a kernel module + for i in $(cd $WOK; grep -l '^WANTED="linux"' */receipt); do [ ! -d "$install/lib/modules/$VERSION-slitaz" ] && return 1 cook ${i%/receipt} - done - + done + # Check any module in kernel .config that's not added to a linux-* pkgs # and remove aufs patches: we dont need them in HG wok. $stuff/check_modules.sh @@ -394,17 +393,16 @@ # Pre and post install commands for Tazpkg. post_install() { - echo "Processing post-install commands..." - chroot "$root/" depmod -a $VERSION-slitaz - - # Handle multiarch installation - case "$SLITAZ_ARCH" in + chroot "$root/" depmod -a $VERSION-slitaz + + # Handle multiarch installation + case "$SLITAZ_ARCH" in arm) echo "Kernel : /boot/linux-$VERSION-slitaz-$ARCH" echo "Modules: /lib/modules/$VERSION-slitaz" return 0 ;; esac - + # GRUB stuff. if [ -f "$1/boot/grub/menu.lst" ]; then # Current root device @@ -413,10 +411,10 @@ # Use device.map to find grub device number grub_dev="$(grep $(echo $root_dev | grep -o '^/dev/.d.' ) \ "$1/boot/grub/device.map" | cut -f1 | sed "s/)$/.$grub_part)/g")" - + # Add and clean kernel entries in case of upgrade for installed system. if ! grep -q vmlinuz-$VERSION-slitaz "$1/boot/grub/menu.lst"; then - + # Clean the old entry # TODO: old vmlinuz file is removed but the entry is still there. # So grub error:15 when selected: http://bugs.slitaz.org/?id=74 @@ -432,9 +430,10 @@ last_entry=$(( $(grep -c '^title' "$1/boot/grub/menu.lst")-1 )) sed -e "s/^default.*/default $last_entry/g" -i "$1/boot/grub/menu.lst" fi - + # Display information message. cat <&1 | sed s'/ERROR:/error:/' xz nvidia.ko } - + # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() -{ +{ EXTRAVERSION=_${kvers} - - mkdir -p $fs/usr/share $fs/usr/lib/X11 $fs/usr/share/licenses/$PACKAGE \ - $fs/lib/modules/$kvers-slitaz/kernel/drivers/video \ - $fs/usr/share/doc/$PACKAGE - + + mkdir -p \ + $fs/usr/share \ + $fs/usr/lib/X11 \ + $fs/usr/share/licenses/$PACKAGE \ + $fs/lib/modules/$kvers-slitaz/kernel/drivers/video \ + $fs/usr/share/doc/$PACKAGE + cp $src/usr/src/nv/nvidia.ko.xz \ - $fs/lib/modules/$kvers-slitaz/kernel/drivers/video/ + $fs/lib/modules/$kvers-slitaz/kernel/drivers/video/ chown root $fs/lib/modules/$kvers-slitaz/kernel/drivers/video/nvidia.ko.xz - chmod 0644 $fs/lib/modules/$kvers-slitaz/kernel/drivers/video/nvidia.ko.xz - + chmod 0644 $fs/lib/modules/$kvers-slitaz/kernel/drivers/video/nvidia.ko.xz + cp -a $src/LICENSE $fs/usr/share/licenses/$PACKAGE cp -a $src/usr/bin $fs/usr cp -a $src/nvidia-installer $fs/usr/bin cp -a $src/usr/lib/*.so* $fs/usr/lib/ cp -a $src/usr/lib/tls $fs/usr/lib/ - cp -a $src/usr/X11R6/lib/libXvMCNVIDIA.so.$VERSION $fs/usr/lib - cp -a $src/usr/X11R6/lib/modules $fs/usr/lib/X11/ - cp -a $src/usr/share/applications $fs/usr/share + cp -a $src/usr/X11R6/lib/libXvMCNVIDIA.so.$VERSION $fs/usr/lib + cp -a $src/usr/X11R6/lib/modules $fs/usr/lib/X11/ + cp -a $src/usr/share/applications $fs/usr/share cp -a $src/usr/share/pixmaps $fs/usr/share cp -a $src/usr/share/doc/* $fs/usr/share/doc/$PACKAGE/ cp -a $src/usr/X11R6/lib/* $fs/usr/lib/X11 - ln -s libcuda.so.$VERSION $fs/usr/lib/libcuda.so + ln -s libcuda.so.$VERSION $fs/usr/lib/libcuda.so ln -s libcuda.so.$VERSION $fs/usr/lib/libcuda.so.1 ln -s libGL.so.$VERSION $fs/usr/lib/libGL.so ln -s libGL.so.$VERSION $fs/usr/lib/libGL.so.1 @@ -69,51 +72,37 @@ ln -s libXvMCNVIDIA.so.$VERSION $fs/usr/lib/libXvMCNVIDIA_dynamic.so ln -s libnvidia-wfb.so.$VERSION $fs/usr/lib/X11/modules/libnvidia-wfb.so ln -s libnvidia-wfb.so.$VERSION $fs/usr/lib/X11/modules/libnvidia-wfb.so.1 - ln -s libglx.so.$VERSION $fs/usr/lib/X11/modules/extensions/libglx.so + ln -s libglx.so.$VERSION $fs/usr/lib/X11/modules/extensions/libglx.so } pre_install() { - echo "" - echo -e "\033[1m PROPRIETARY LICENSE:\033[0m $2" - echo "================================================================================" + title "PROPRIETARY LICENSE" echo "You are installing a package with proprietary license." echo "You must accept the license." - echo "================================================================================" - echo "" - + footer } post_install() { - echo "Processing post-install commands..." - chroot "$root/" depmod -a ${EXTRAVERSION#_}-slitaz - + chroot "$1/" depmod -a ${EXTRAVERSION#_}-slitaz + # correct .desktop file file sed -i 's:__UTILS_PATH__/::' "$1/usr/share/applications/nvidia-settings.desktop" sed -i 's:__PIXMAP_PATH__/::' "$1/usr/share/applications/nvidia-settings.desktop" - - echo "" - echo -e "\033[1m NVIDIA LICENSE INFORMATION:\033[0m $2" - echo "================================================================================" + + title "NVIDIA LICENSE INFORMATION" echo "For installing this package, you have to accept the $PACKAGE license." - echo "The license is stored in /usr/share/licenses/$PACKAGE " - echo -n "Would you like to read the license (y/N) : "; read anser - if [ "$anser" = "y" ]; then - cat /usr/share/licenses/"$PACKAGE"/LICENSE | more - echo "" + echo "The license is stored in /usr/share/licenses/$PACKAGE " + echo -n "Would you like to read the license (y/N) : "; read anser + if [ "$anser" == 'y' ]; then + more "$1/usr/share/licenses/$PACKAGE/LICENSE" + newline fi - echo "================================================================================" - echo -n "Do you accept the license (y/N) : "; read anser - if [ "$anser" = "N" ]; then - echo "You did not accept the license, Removing the pkg." - tazpkg remove "$PACKAGE" + separator + echo -n 'Do you accept the license (y/N) : '; read anser + if [ "$anser" == 'N' ]; then + echo 'You did not accept the license, Removing the pkg.' + tazpkg remove "$PACKAGE" fi - } - -post_remove() -{ - echo "Processing post-remove commands..." - depmod -a -} diff -r b685a2174a02 -r d6ca18366f41 open-iscsi/receipt --- a/open-iscsi/receipt Mon Dec 21 01:46:18 2015 +0200 +++ b/open-iscsi/receipt Mon Dec 21 02:53:09 2015 +0200 @@ -15,7 +15,6 @@ # Rules to configure and make the package. compile_rules() { - cd $src sed -i 's/ install_kernel / /' Makefile sed -i 's|dirent.h>|&\n#include \n#include |' \ usr/iscsi_sysfs.c @@ -33,8 +32,7 @@ post_install() { - echo "Processing post-install commands..." if [ ! -f "$1/etc/iscsi/initiatorname.iscsi" ]; then - echo "InitiatorName=$($1/sbin/iscsi-iname)" > "$1/etc/iscsi/initiatorname.iscsi" + echo "InitiatorName=$($1/sbin/iscsi-iname)" > "$1/etc/iscsi/initiatorname.iscsi" fi } diff -r b685a2174a02 -r d6ca18366f41 ovz-web-panel/receipt --- a/ovz-web-panel/receipt Mon Dec 21 01:46:18 2015 +0200 +++ b/ovz-web-panel/receipt Mon Dec 21 02:53:09 2015 +0200 @@ -15,7 +15,6 @@ # Rules to configure and make the package. compile_rules() { - cd $src # Apply patches while read patch_file; do if [ -f done.$patch_file ]; then @@ -36,29 +35,28 @@ genpkg_rules() { mkdir -p $fs/usr/share \ - $fs/etc - + $fs/etc + cp -a $install $fs/usr/share/$PACKAGE cp -a $fs/usr/share/$PACKAGE/config/owp.conf.sample $fs/etc/owp.conf cp -a $fs/usr/share/$PACKAGE/utils/hw-daemon/hw-daemon.ini.sample $fs/usr/share/$PACKAGE/utils/hw-daemon/hw-daemon.ini - + # Set secret key sed -i 's/secret/2918b7aafc1f5f753ee232a7e7f78175/' \ $fs/usr/share/$PACKAGE/utils/hw-daemon/hw-daemon.ini - + # Set program homedir sed -i 's!/opt!/usr/share!' $fs/etc/owp.conf - + # Fix perms chmod 755 $fs/usr/share/$PACKAGE/script/owp - + # Cleaning. rm -f $fs/usr/share/$PACKAGE/done.*.u } post_install() { - echo "Processing post-install commands..." chroot "$1/" ln -s /usr/share/$PACKAGE/script/owp /etc/init.d/owp } diff -r b685a2174a02 -r d6ca18366f41 ssmtp/receipt --- a/ssmtp/receipt Mon Dec 21 01:46:18 2015 +0200 +++ b/ssmtp/receipt Mon Dec 21 02:53:09 2015 +0200 @@ -17,42 +17,39 @@ # Rules to configure and make the package. compile_rules() { - cd $src - sed -i 's|@LIBS@|& -lcrypto|' Makefile.in - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --enable-md5auth \ - --enable-ssl \ - $CONFIGURE_ARGS && - make && + sed -i 's|@LIBS@|& -lcrypto|' Makefile.in + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --enable-md5auth \ + --enable-ssl \ + $CONFIGURE_ARGS && + make - # Install - mkdir -p $DESTDIR/usr/sbin $DESTDIR/etc/ssmtp - cp ssmtp $DESTDIR/usr/sbin - cp revaliases ssmtp.conf $DESTDIR/etc/ssmtp + # Install + mkdir -p $DESTDIR/usr/sbin $DESTDIR/etc/ssmtp + cp ssmtp $DESTDIR/usr/sbin + cp revaliases ssmtp.conf $DESTDIR/etc/ssmtp } # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr - cp -a $install/usr/sbin/ $fs/usr/ - cp -a $install/etc/ $fs/ + mkdir -p $fs/usr + cp -a $install/usr/sbin/ $fs/usr/ + cp -a $install/etc/ $fs/ } -post_install() +post_install() { - echo "Processing post-install commands..." - ln -sf /usr/sbin/ssmtp "$1/usr/sbin/sendmail" - ln -sf /usr/sbin/ssmtp "$1/usr/sbin/newaliases" - ln -sf /usr/sbin/ssmtp "$1/usr/sbin/mailq" + ln -sf /usr/sbin/ssmtp "$1/usr/sbin/sendmail" + ln -sf /usr/sbin/ssmtp "$1/usr/sbin/newaliases" + ln -sf /usr/sbin/ssmtp "$1/usr/sbin/mailq" } -post_remove() +post_remove() { - echo "Processing post-remove commands..." - rm -f "$1/usr/sbin/sendmail" - rm -f "$1/usr/sbin/newaliases" - rm -f "$1/usr/sbin/mailq" + rm -f "$1/usr/sbin/sendmail" + rm -f "$1/usr/sbin/newaliases" + rm -f "$1/usr/sbin/mailq" } diff -r b685a2174a02 -r d6ca18366f41 sudo/receipt --- a/sudo/receipt Mon Dec 21 01:46:18 2015 +0200 +++ b/sudo/receipt Mon Dec 21 02:53:09 2015 +0200 @@ -14,7 +14,6 @@ # Rules to configure and make the package. compile_rules() { - cd $src ./configure --sysconfdir=/etc \ --without-pam \ --with-editor=/bin/vi \ @@ -38,7 +37,6 @@ pre_install() { - echo "Processing pre-install commands..." if [ -f "$1/etc/sudoers.bak" ]; then cp "$1/etc/sudoers" "$1/etc/sudoers.bak" fi @@ -46,7 +44,6 @@ post_install() { - echo "Processing post-install commands..." if [ -f "$1/etc/sudoers.bak" ]; then mv "$1/etc/sudoers" "$1/etc/sudoers-dist" mv "$1/etc/sudoers.bak" "$1/etc/sudoers" @@ -54,4 +51,4 @@ chown root.root "$1/etc/sudoers" chmod 0440 "$1/etc/sudoers" fi -} +} diff -r b685a2174a02 -r d6ca18366f41 usbutils/receipt --- a/usbutils/receipt Mon Dec 21 01:46:18 2015 +0200 +++ b/usbutils/receipt Mon Dec 21 02:53:09 2015 +0200 @@ -37,18 +37,6 @@ rm -f $fs/usr/bin/lsusb.py } -# Pre and post install commands for Tazpkg. -# Busybox lsusb does not display human-readable usb.ids hardware info. -# We must remove busybox lsusb symlink before installing. -# -pre_install() -{ - echo "Processing pre-install commands..." - echo -n "Removing Busybox lsusb... " - rm -f "$1/usr/bin/lsusb" - status -} - post_remove() { ln -s /bin/busybox "$1/usr/bin/lsusb" diff -r b685a2174a02 -r d6ca18366f41 xfce4/receipt --- a/xfce4/receipt Mon Dec 21 01:46:18 2015 +0200 +++ b/xfce4/receipt Mon Dec 21 02:53:09 2015 +0200 @@ -9,9 +9,9 @@ SUGGESTED="xfce4-slitaz-config" WEB_SITE="http://www.xfce.org" -DEPENDS="libxfce4util xfconf libxfce4ui garcon libexo - xfce4-panel thunar xfce4-settings xfce4-session xfwm4 xfdesktop thunar-volman - thunar-archive-plugin xfce-utils" +DEPENDS="libxfce4util xfconf libxfce4ui garcon libexo \ +xfce4-panel thunar xfce4-settings xfce4-session xfwm4 xfdesktop thunar-volman \ +thunar-archive-plugin xfce-utils" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() @@ -21,13 +21,10 @@ post_install() { - echo "Processing postinstall commands..." - # Adding xfce to SLIM available sessions. if ! grep -q xfce "$1/etc/slim.conf"; then sed -i s/,jwm/,jwm,xfce/ "$1/etc/slim.conf" fi - + # Adding xfce support to tazx - }