From 114ae232b33e1f8dde2418af5fd3c0f0b5e035dd Mon Sep 17 00:00:00 2001 From: gobo72 Date: Fri, 26 Aug 2011 22:11:40 +0000 Subject: [PATCH] =?utf8?q?Ajout=20option=20-v=20=C3=A0=20tous=20les=20appe?= =?utf8?q?ls=20de=20la=20commande=20install?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- stage0/pkg/ncurses | 2 +- stage1/create-config-files | 3 +-- stage1/install-bootscripts | 2 +- stage1/pkg/sysvinit | 2 +- stage2/compressdoc | 2 +- stage2/install-bootscripts | 2 +- stage2/pkg/acpid | 2 +- stage2/pkg/nano | 2 +- stage2/pkg/udev | 4 ++-- stage2/pkg/wireless-tools | 2 +- stage2/pkg/wpa_supplicant | 6 +++--- stage3/pkg/docbook-dsssl | 6 +++--- stage3/pkg/docbook-xml | 4 ++-- stage3/pkg/fcron | 2 +- stage3/pkg/getdate | 2 +- stage3/pkg/krb5 | 2 +- stage3/pkg/mysql | 4 ++-- stage3/pkg/openjade | 4 ++-- stage3/pkg/pciutils | 2 +- stage3/pkg/sgml-dtd3 | 4 ++-- stage3/pkg/sgml-dtd4 | 4 ++-- stage3/pkg/usbutils | 2 +- stage5/pkg/clamav | 2 +- stage5/pkg/cups-pdf | 2 +- stage5/pkg/emacs | 6 +++--- stage5/pkg/samba | 6 +++--- stage5/pkg/sane-backends | 2 +- stage5/pkg/spamassassin | 2 +- stage5/pkg/uw-imap | 18 +++++++++--------- 29 files changed, 51 insertions(+), 52 deletions(-) diff --git a/stage0/pkg/ncurses b/stage0/pkg/ncurses index 52fce24..7d4a680 100644 --- a/stage0/pkg/ncurses +++ b/stage0/pkg/ncurses @@ -15,5 +15,5 @@ hvbuid() ${HVMAKE} -C progs tic # Install tic - install -m755 progs/tic /cross-tools/bin + install -v -m755 progs/tic /cross-tools/bin } diff --git a/stage1/create-config-files b/stage1/create-config-files index e2b284e..f19c0ae 100755 --- a/stage1/create-config-files +++ b/stage1/create-config-files @@ -121,8 +121,7 @@ else fi EOF -echo "Installing /etc/DIR_COLORS" -install -m644 ${SCRDIR}/misc/DIR_COLORS ${LFS}/etc/DIR_COLORS +install -v -m644 ${SCRDIR}/misc/DIR_COLORS ${LFS}/etc/DIR_COLORS echo "Creating /etc/inputrc" cat > ${LFS}/etc/inputrc << "EOF" diff --git a/stage1/install-bootscripts b/stage1/install-bootscripts index 8b9aef4..e248388 100755 --- a/stage1/install-bootscripts +++ b/stage1/install-bootscripts @@ -12,7 +12,7 @@ STAGE1_BOOTSCRIPTS="checkfs cleanfs functions halt hostname initlog modules moun mountkernfs rc reboot sendsignals setclock swap udev" mkdir -p ${LFS}/etc/rc.d/init.d for bootscript in ${STAGE1_BOOTSCRIPTS}; do - install -m755 bootscripts/${bootscript} ${LFS}/etc/rc.d/init.d + install -v -m755 bootscripts/${bootscript} ${LFS}/etc/rc.d/init.d done # Creating runlevels links diff --git a/stage1/pkg/sysvinit b/stage1/pkg/sysvinit index a8a546c..8181981 100644 --- a/stage1/pkg/sysvinit +++ b/stage1/pkg/sysvinit @@ -14,5 +14,5 @@ hvbuild() make -C src CC="${CC} ${BUILD64}" make -C src install INSTALL=install ROOT=${LFS} - install -m644 ${SCRDIR}/misc/inittab ${LFS}/etc + install -v -m644 ${SCRDIR}/misc/inittab ${LFS}/etc } diff --git a/stage2/compressdoc b/stage2/compressdoc index 3e275aa..5dc5d97 100755 --- a/stage2/compressdoc +++ b/stage2/compressdoc @@ -3,7 +3,7 @@ source ../functions/main # If not already installed by previous invocation of this script: -install -m755 ${SCRDIR}/misc/compressdoc /usr/sbin +install -v -m755 ${SCRDIR}/misc/compressdoc /usr/sbin # Compressing man pages with bzip2 /usr/sbin/compressdoc --bz2 diff --git a/stage2/install-bootscripts b/stage2/install-bootscripts index 632db4e..c3a2edd 100755 --- a/stage2/install-bootscripts +++ b/stage2/install-bootscripts @@ -90,7 +90,7 @@ sed -i -e "s!^\(export PATH=\).*tools.*!\1/bin:/usr/bin:/sbin:/usr/sbin!" /etc/r # Copying boot scripts STAGE2_BOOTSCRIPTS="ifdown ifup keyboard mountnetfs network syslogd klogd" for bootscript in ${STAGE2_BOOTSCRIPTS}; do - install -m755 bootscripts/${bootscript} /etc/rc.d/init.d + install -v -m755 bootscripts/${bootscript} /etc/rc.d/init.d done # Necessary because bootscript_add_* scripts use ${LFS} when diff --git a/stage2/pkg/acpid b/stage2/pkg/acpid index aff4960..afb39ec 100644 --- a/stage2/pkg/acpid +++ b/stage2/pkg/acpid @@ -2,7 +2,7 @@ hvbuild_post() { - install -d -m755 /etc/acpi/events + install -v -d -m755 /etc/acpi/events cat > /etc/acpi/events/button-lid << EOF # When the lid is closed, go into suspend to ram diff --git a/stage2/pkg/nano b/stage2/pkg/nano index 95f125b..b1fae74 100644 --- a/stage2/pkg/nano +++ b/stage2/pkg/nano @@ -4,5 +4,5 @@ hvbuild_post() { - install -m644 ${SCRDIR}/misc/nanorc /etc + install -v -m644 ${SCRDIR}/misc/nanorc /etc } diff --git a/stage2/pkg/udev b/stage2/pkg/udev index 475748e..1cea3cb 100644 --- a/stage2/pkg/udev +++ b/stage2/pkg/udev @@ -14,6 +14,6 @@ hvconfig_pre() hvbuild_post() { - install -m755 ${SCRDIR}/misc/udev-create-persistent-net.sh /usr/local/bin - install -m644 ${SCRDIR}/misc/udev-media-automount.rules /etc/udev/rules.d/10-media-automount.rules + install -v -m755 ${SCRDIR}/misc/udev-create-persistent-net.sh /usr/local/bin + install -v -m644 ${SCRDIR}/misc/udev-media-automount.rules /etc/udev/rules.d/10-media-automount.rules } diff --git a/stage2/pkg/wireless-tools b/stage2/pkg/wireless-tools index 1dc3201..e617a12 100644 --- a/stage2/pkg/wireless-tools +++ b/stage2/pkg/wireless-tools @@ -8,7 +8,7 @@ hvconfig_pre() hvbuild_post() { - install -d -m755 /etc/sysconfig/network/ssid + install -v -d -m755 /etc/sysconfig/network/ssid cat > /etc/sysconfig/network/ssid/TEMPLATE << EOF # This file must be named exactly as your ESSID (case is important) diff --git a/stage2/pkg/wpa_supplicant b/stage2/pkg/wpa_supplicant index 69c8331..8578df9 100644 --- a/stage2/pkg/wpa_supplicant +++ b/stage2/pkg/wpa_supplicant @@ -25,9 +25,9 @@ CONFIG_INTERNAL_LIBTOMMATH_FAST=y EOF make - install -m 755 wpa_cli wpa_supplicant wpa_passphrase /sbin - install -m 644 doc/docbook/*8 /usr/man/man8 - install -m 644 doc/docbook/wpa_supplicant.conf.5 /usr/man/man5 + install -v -m 755 wpa_cli wpa_supplicant wpa_passphrase /sbin + install -v -m 644 doc/docbook/*8 /usr/man/man8 + install -v -m 644 doc/docbook/wpa_supplicant.conf.5 /usr/man/man5 } hvbuild_post() diff --git a/stage3/pkg/docbook-dsssl b/stage3/pkg/docbook-dsssl index 0c4077d..5382ad2 100644 --- a/stage3/pkg/docbook-dsssl +++ b/stage3/pkg/docbook-dsssl @@ -4,9 +4,9 @@ hvbuild() { cd ${LFS_TMP}/${PACKAGE} - install -m755 bin/collateindex.pl /usr/bin - install -m644 bin/collateindex.pl.1 /usr/share/man/man1 - install -d -m755 \ + install -v -m755 bin/collateindex.pl /usr/bin + install -v -m644 bin/collateindex.pl.1 /usr/share/man/man1 + install -v -d -m755 \ /usr/share/sgml/docbook/dsssl-stylesheets-${DOCBOOK_DSSSL_VER} cp -R * /usr/share/sgml/docbook/dsssl-stylesheets-${DOCBOOK_DSSSL_VER} install-catalog --add /etc/sgml/dsssl-docbook-stylesheets.cat \ diff --git a/stage3/pkg/docbook-xml b/stage3/pkg/docbook-xml index 2810120..7469544 100644 --- a/stage3/pkg/docbook-xml +++ b/stage3/pkg/docbook-xml @@ -3,8 +3,8 @@ hvbuild() { cd ${LFS_TMP}/${PACKAGE} - install -d -m755 /usr/share/xml/docbook/xml-dtd-${DOCBOOK_XML_VER} - install -d -m755 /etc/xml + install -v -d -m755 /usr/share/xml/docbook/xml-dtd-${DOCBOOK_XML_VER} + install -v -d -m755 /etc/xml chown -R root:root . cp -af docbook.cat *.dtd ent/ *.mod \ /usr/share/xml/docbook/xml-dtd-${DOCBOOK_XML_VER} diff --git a/stage3/pkg/fcron b/stage3/pkg/fcron index 4b8c768..1397f71 100644 --- a/stage3/pkg/fcron +++ b/stage3/pkg/fcron @@ -57,7 +57,7 @@ editor = /usr/bin/nano EOF chmod 640 /etc/fcron/fcron.conf - install -d /var/spool/fcron + install -v -d /var/spool/fcron chown fcron.fcron /var/spool/fcron cat > /etc/fcron/configure << "EOF" diff --git a/stage3/pkg/getdate b/stage3/pkg/getdate index 9d6775f..3c2461f 100644 --- a/stage3/pkg/getdate +++ b/stage3/pkg/getdate @@ -33,5 +33,5 @@ EOF chmod 740 /usr/local/bin/hvgetdate # Adding fcrontab entry - install -m644 ${SCRDIR}/misc/hvgetdate /etc/fcron/fcron.d + install -v -m644 ${SCRDIR}/misc/hvgetdate /etc/fcron/fcron.d } diff --git a/stage3/pkg/krb5 b/stage3/pkg/krb5 index d305117..8f6f0df 100644 --- a/stage3/pkg/krb5 +++ b/stage3/pkg/krb5 @@ -35,7 +35,7 @@ hvbuild_post() #if [ ! -f /bin/login.shadow ]; then # mv -v /bin/login /bin/login.shadow #fi - #install -m755 -v /usr/sbin/login.krb5 /bin/login + #install -v -m755 /usr/sbin/login.krb5 /bin/login mv -v /usr/lib/libdes425.so.3* /lib mv -v /usr/lib/libkrb4.so.2* /lib diff --git a/stage3/pkg/mysql b/stage3/pkg/mysql index 47163bb..9dbf7ad 100644 --- a/stage3/pkg/mysql +++ b/stage3/pkg/mysql @@ -39,7 +39,7 @@ hvbuild_post() mysql_install_db --user=mysql chgrp mysql /srv/mysql{,/test,/mysql} - install -m750 -o mysql -g mysql -d /var/run/mysql + install -v -m750 -o mysql -g mysql -d /var/run/mysql # Further configuration requires that the MySQL server be running # (see cis-postinstall) @@ -54,5 +54,5 @@ hvbuild_post() string_add "/usr/lib/mysql" /etc/ld.so.conf # Install Hv configuration script - install -m644 ${SCRDIR}/misc/hv-config-mysql /usr/local/bin + install -v -m644 ${SCRDIR}/misc/hv-config-mysql /usr/local/bin } diff --git a/stage3/pkg/openjade b/stage3/pkg/openjade index c4c2236..b2cf594 100644 --- a/stage3/pkg/openjade +++ b/stage3/pkg/openjade @@ -17,8 +17,8 @@ hvbuild_post() ln -sf libogrove.so /usr/lib/libgrove.so ln -sf libospgrove.so /usr/lib/libspgrove.so ln -sf libostyle.so /usr/lib/libstyle.so - install -m644 dsssl/catalog /usr/share/sgml/${PACKAGE}/ - install -m644 dsssl/*.{dtd,dsl,sgm} /usr/share/sgml/${PACKAGE} + install -v -m644 dsssl/catalog /usr/share/sgml/${PACKAGE}/ + install -v -m644 dsssl/*.{dtd,dsl,sgm} /usr/share/sgml/${PACKAGE} install-catalog --add /etc/sgml/${PACKAGE}.cat \ /usr/share/sgml/${PACKAGE}/catalog install-catalog --add /etc/sgml/sgml-docbook.cat \ diff --git a/stage3/pkg/pciutils b/stage3/pkg/pciutils index d34ae77..1afa7bf 100644 --- a/stage3/pkg/pciutils +++ b/stage3/pkg/pciutils @@ -15,5 +15,5 @@ hvbuild() hvbuild_post() { - install -m644 ${SCRDIR}/misc/update-pciids /etc/fcron/fcron.d + install -v -m644 ${SCRDIR}/misc/update-pciids /etc/fcron/fcron.d } diff --git a/stage3/pkg/sgml-dtd3 b/stage3/pkg/sgml-dtd3 index a18c11d..5bdaad2 100644 --- a/stage3/pkg/sgml-dtd3 +++ b/stage3/pkg/sgml-dtd3 @@ -6,9 +6,9 @@ hvbuild() sed -i -e '/ISO 8879/d' \ -e 's|DTDDECL "-//OASIS//DTD DocBook V3.1//EN"|SGMLDECL|g' \ docbook.cat - install -d /usr/share/sgml/docbook/sgml-dtd-${SGML_DTD3_VER} + install -v -d /usr/share/sgml/docbook/sgml-dtd-${SGML_DTD3_VER} chown -R root:root . - install docbook.cat \ + install -v docbook.cat \ /usr/share/sgml/docbook/sgml-dtd-${SGML_DTD3_VER}/catalog cp -af *.dtd *.mod *.dcl /usr/share/sgml/docbook/sgml-dtd-${SGML_DTD3_VER} install-catalog --add /etc/sgml/sgml-docbook-dtd-${SGML_DTD3_VER}.cat \ diff --git a/stage3/pkg/sgml-dtd4 b/stage3/pkg/sgml-dtd4 index 5d41192..cd9c715 100644 --- a/stage3/pkg/sgml-dtd4 +++ b/stage3/pkg/sgml-dtd4 @@ -5,9 +5,9 @@ hvbuild() cd ${LFS_TMP}/${PACKAGE} sed -i -e '/ISO 8879/d' \ -e '/gml/d' docbook.cat - install -d /usr/share/sgml/docbook/sgml-dtd-${SGML_DTD4_VER} + install -v -d /usr/share/sgml/docbook/sgml-dtd-${SGML_DTD4_VER} chown -R root:root . - install docbook.cat \ + install -v docbook.cat \ /usr/share/sgml/docbook/sgml-dtd-${SGML_DTD4_VER}/catalog cp -af *.dtd *.mod *.dcl /usr/share/sgml/docbook/sgml-dtd-${SGML_DTD4_VER} install-catalog --add /etc/sgml/sgml-docbook-dtd-${SGML_DTD4_VER}.cat \ diff --git a/stage3/pkg/usbutils b/stage3/pkg/usbutils index eca956c..9a5f186 100644 --- a/stage3/pkg/usbutils +++ b/stage3/pkg/usbutils @@ -9,5 +9,5 @@ hvconfig_pre() hvbuild_post() { - install -m644 ${SCRDIR}/misc/update-usbids /etc/fcron/fcron.d + install -v -m644 ${SCRDIR}/misc/update-usbids /etc/fcron/fcron.d } diff --git a/stage5/pkg/clamav b/stage5/pkg/clamav index d970163..35d988a 100644 --- a/stage5/pkg/clamav +++ b/stage5/pkg/clamav @@ -21,7 +21,7 @@ hvconfig_post() hvbuild_post() { - install -m644 ${SCRDIR}/misc/freshclam /etc/fcron/fcron.d + install -v -m644 ${SCRDIR}/misc/freshclam /etc/fcron/fcron.d touch /var/log/clamd.log chmod 600 /var/log/clamd.log diff --git a/stage5/pkg/cups-pdf b/stage5/pkg/cups-pdf index 18d5079..269137e 100644 --- a/stage5/pkg/cups-pdf +++ b/stage5/pkg/cups-pdf @@ -4,7 +4,7 @@ hvbuild() { cd ${LFS_TMP}/${PACKAGE}/src gcc -O9 -s -o cups-pdf cups-pdf.c - install -m 0700 cups-pdf /usr/lib/cups/backend + install -v -m 0700 cups-pdf /usr/lib/cups/backend cd ${LFS_TMP}/${PACKAGE} cp extra/cups-pdf.conf /etc/cups diff --git a/stage5/pkg/emacs b/stage5/pkg/emacs index 1593df7..5ab325d 100644 --- a/stage5/pkg/emacs +++ b/stage5/pkg/emacs @@ -16,13 +16,13 @@ hvbuild() hvbuild_post() { - install -m644 ${SCRDIR}/misc/emacs/emacsrc /etc/skel/.emacs - install -m644 ${SCRDIR}/misc/emacs/emacsrc /root/.emacs + install -v -m644 ${SCRDIR}/misc/emacs/emacsrc /etc/skel/.emacs + install -v -m644 ${SCRDIR}/misc/emacs/emacsrc /root/.emacs LOCAL_SITE_LIST=/usr/local/share/emacs/site-lisp install -v -m644 -d ${LOCAL_SITE_LIST} - install -m644 ${SCRDIR}/misc/emacs/buffer-cycle.el ${LOCAL_SITE_LIST} + install -v -m644 ${SCRDIR}/misc/emacs/buffer-cycle.el ${LOCAL_SITE_LIST} # Set Emacs as default editor sed -i -e "s!^\(EDITOR=\).*!\1emacs!" /etc/profile diff --git a/stage5/pkg/samba b/stage5/pkg/samba index 2fbc784..7c6be69 100644 --- a/stage5/pkg/samba +++ b/stage5/pkg/samba @@ -24,14 +24,14 @@ hvbuild_post() #chmod 644 /usr/include/libsmbclient.h /usr/lib/samba/libsmbclient.a chmod 644 /usr/include/libsmbclient.h - install -m755 nsswitch/libnss_win{s,bind}.so /lib + install -v -m755 nsswitch/libnss_win{s,bind}.so /lib ln -sf libnss_winbind.so /lib/libnss_winbind.so.2 ln -sf libnss_wins.so /lib/libnss_wins.so.2 cp ../examples/smb.conf.default /etc/samba - install -m644 ../docs/*.pdf /usr/share/samba + install -v -m644 ../docs/*.pdf /usr/share/samba if [ -f nsswitch/pam_winbind.so ]; then - install -m755 nsswitch/pam_winbind.so /lib/security + install -v -m755 nsswitch/pam_winbind.so /lib/security fi # Configuring SWAT diff --git a/stage5/pkg/sane-backends b/stage5/pkg/sane-backends index 695a11d..02a9200 100644 --- a/stage5/pkg/sane-backends +++ b/stage5/pkg/sane-backends @@ -23,7 +23,7 @@ hvconfig_pre() hvbuild_post() { - install -m 644 -v tools/udev/libsane.rules \ + install -v -m 644 tools/udev/libsane.rules \ /etc/udev/rules.d/65-scanner.rules # Addition to /etc/services (for both the client and server) diff --git a/stage5/pkg/spamassassin b/stage5/pkg/spamassassin index 4811bd8..b32888a 100644 --- a/stage5/pkg/spamassassin +++ b/stage5/pkg/spamassassin @@ -42,7 +42,7 @@ exit $? EOF chmod 755 /usr/local/bin/hv-sa-learn - install -m644 ${SCRDIR}/misc/sa-learn /etc/fcron/fcron.d + install -v -m644 ${SCRDIR}/misc/sa-learn /etc/fcron/fcron.d # Add rule to procmailrc... diff --git a/stage5/pkg/uw-imap b/stage5/pkg/uw-imap index 326f9cb..37eee8a 100644 --- a/stage5/pkg/uw-imap +++ b/stage5/pkg/uw-imap @@ -10,23 +10,23 @@ hvbuild() make lnp # Installing imapd - install -m 755 imapd/imapd /usr/bin - install -m 644 src/imapd/imapd.8 /usr/man/man8/imapd.8 + install -v -m 755 imapd/imapd /usr/bin + install -v -m 644 src/imapd/imapd.8 /usr/man/man8/imapd.8 # Installing mailutil - install -m 755 mailutil/mailutil /usr/bin - install -m 644 src/mailutil/mailutil.1 /usr/man/man1/mailutil.1 + install -v -m 755 mailutil/mailutil /usr/bin + install -v -m 644 src/mailutil/mailutil.1 /usr/man/man1/mailutil.1 # Installing dmail - install -m 755 dmail/dmail /usr/bin - install -m 644 src/dmail/dmail.1 /usr/man/man1/dmail.1 + install -v -m 755 dmail/dmail /usr/bin + install -v -m 644 src/dmail/dmail.1 /usr/man/man1/dmail.1 # Installing C-library mkdir -p /usr/lib/uw-imap/{include,lib} - install -m 644 c-client/c-client.a /usr/lib/uw-imap/lib + install -v -m 644 c-client/c-client.a /usr/lib/uw-imap/lib ln -sf /usr/lib/uw-imap/lib/c-client.a /usr/lib/uw-imap/lib/libc-client.a - install -m 644 c-client/*.h /usr/lib/uw-imap/include - install -m 644 src/osdep/tops-20/shortsym.h /usr/lib/uw-imap/include + install -v -m 644 c-client/*.h /usr/lib/uw-imap/include + install -v -m 644 src/osdep/tops-20/shortsym.h /usr/lib/uw-imap/include # Addition to xinetd cat > /etc/xinetd.d/imapd << "EOF" -- 2.20.1