From 2516921cc8d37126ab30db439cdd33b0b21b805e Mon Sep 17 00:00:00 2001 From: tnut Date: Wed, 8 Sep 2010 22:47:01 +0200 Subject: maj pkgutils#5.35.0-2 --- base/pkgutils/.md5sum | 2 +- base/pkgutils/Pkgfile | 6 +- base/pkgutils/nutyx-attapu.1.patch | 169 ------------------------------------- base/pkgutils/nutyx-attapu.2.patch | 169 +++++++++++++++++++++++++++++++++++++ 4 files changed, 173 insertions(+), 173 deletions(-) delete mode 100644 base/pkgutils/nutyx-attapu.1.patch create mode 100644 base/pkgutils/nutyx-attapu.2.patch (limited to 'base') diff --git a/base/pkgutils/.md5sum b/base/pkgutils/.md5sum index 98be821fc..5512e834e 100644 --- a/base/pkgutils/.md5sum +++ b/base/pkgutils/.md5sum @@ -1,2 +1,2 @@ -00e6658a19d7b8192b8b4cd81a315b13 nutyx-attapu.1.patch +05273aa3ec5be328b8b92507d8ce11ca nutyx-attapu.2.patch edbe9ace5fb6e9a2cae806d2eabf62f1 pkgutils-5.35.0.tar.gz diff --git a/base/pkgutils/Pkgfile b/base/pkgutils/Pkgfile index 7dd02602f..6e97583ce 100644 --- a/base/pkgutils/Pkgfile +++ b/base/pkgutils/Pkgfile @@ -5,13 +5,13 @@ name=pkgutils version=5.35.0 -release=1 +release=2 source=(http://crux.nu/files/$name-$version.tar.gz \ -nutyx-attapu.1.patch) +nutyx-attapu.2.patch) build () { cd $name-$version mkdir -p $PKG/usr/share -patch -Np1 -i ../nutyx-attapu.1.patch +patch -Np1 -i ../nutyx-attapu.2.patch make DESTDIR=$PKG install case `uname -m` in x86_64) diff --git a/base/pkgutils/nutyx-attapu.1.patch b/base/pkgutils/nutyx-attapu.1.patch deleted file mode 100644 index df13057cd..000000000 --- a/base/pkgutils/nutyx-attapu.1.patch +++ /dev/null @@ -1,169 +0,0 @@ ---- pkgutils-5.35.0-original/pkgmk.in 2010-06-26 18:46:59.000000000 +0200 -+++ pkgutils-5.35.0/pkgmk.in 2010-08-21 16:20:34.000000000 +0200 -@@ -20,6 +20,7 @@ - # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - # USA. - # -+# Adjusted for NuTyX 2009.1 by thierryn1 at hispeed dot ch - - ## - # error codes -@@ -294,13 +295,30 @@ - - cd $PKG - -- find . -type f -path "*/man/man*/*" | while read FILE; do -+ find . -type f -path "*/share/man*/*" | while read FILE; do - if [ "$FILE" = "${FILE%%.gz}" ]; then - gzip -9 "$FILE" - fi - done - -- find . -type l -path "*/man/man*/*" | while read FILE; do -+ find . -type l -path "*/share/man*/*" | while read FILE; do -+ TARGET=`readlink -n "$FILE"` -+ TARGET="${TARGET##*/}" -+ TARGET="${TARGET%%.gz}.gz" -+ rm -f "$FILE" -+ FILE="${FILE%%.gz}.gz" -+ DIR=`dirname "$FILE"` -+ -+ if [ -e "$DIR/$TARGET" ]; then -+ ln -sf "$TARGET" "$FILE" -+ fi -+ done -+ find . -type f -path "*/share/info/*" | while read FILE; do -+ if [ "$FILE" = "${FILE%%.gz}" ]; then -+ gzip -9 "$FILE" -+ fi -+ done -+ find . -type l -path "*/share/info/*" | while read FILE; do - TARGET=`readlink -n "$FILE"` - TARGET="${TARGET##*/}" - TARGET="${TARGET%%.gz}.gz" -@@ -392,7 +410,11 @@ - fi - - compress_manpages -- -+ -+ if [ "$PKGMK_KEEP_LOCALES" == "no" ]; then -+ remove_locale -+ fi -+ - cd $PKG - info "Build result:" - -@@ -529,28 +551,45 @@ - print_help() { - echo "usage: `basename $PKGMK_COMMAND` [options]" - echo "options:" -- echo " -i, --install build and install package" -- echo " -u, --upgrade build and install package (as upgrade)" -- echo " -r, --recursive search for and build packages recursively" -- echo " -d, --download download missing source file(s)" -- echo " -do, --download-only do not build, only download missing source file(s)" -- echo " -eo, --extract-only do not build, only extract source file(s)" -- echo " -utd, --up-to-date do not build, only check if package is up to date" -- echo " -uf, --update-footprint update footprint using result from last build" -- echo " -if, --ignore-footprint build package without checking footprint" -- echo " -in, --ignore-new build package, ignore new files in a footprint missmatch" -- echo " -um, --update-md5sum update md5sum" -- echo " -im, --ignore-md5sum build package without checking md5sum" -- echo " -cm, --check-md5sum do not build, only check md5sum" -- echo " -ns, --no-strip do not strip executable binaries or libraries" -- echo " -f, --force build package even if it appears to be up to date" -- echo " -c, --clean remove package and downloaded files" -- echo " -kw, --keep-work keep temporary working directory" -- echo " -cf, --config-file use alternative configuration file" -- echo " -v, --version print version and exit " -- echo " -h, --help print help and exit" -+ echo " -i, --install compile et installe le paquet" -+ echo " -u, --upgrade compile et installe le paquet (met à jour)" -+ echo " -r, --recursive recherche et compile les paquets de façon récursive" -+ echo " -d, --download télécharge les fichiers sources manquants" -+ echo " -do, --download-only télécharge uniquement les fichiers sources sans compiler" -+ echo " -eo, --extract-only extrait uniquement les source sans construire le paquet" -+ echo " -utd, --up-to-date véridie uniquement si le paquet est à jour" -+ echo " -uf, --update-footprint met à jour la signature du paquet résultant de la dernière compilation" -+ echo " -if, --ignore-footprint compile le paquet en ignorant la signature" -+ echo " -in, --ignore-new compile le paquet en ignorant la nouvelle signature" -+ echo " -um, --update-md5sum met à jour le md5sum" -+ echo " -im, --ignore-md5sum compile le paquet en ignorant le md5sum" -+ echo " -cm, --check-md5sum vérifie seulement le md5sum" -+ echo " -ns, --no-strip ne réduit pas les binairess ou librairies" -+ echo " -f, --force force la compilation même si le paquet est à jour" -+ echo " -c, --clean supprime le paquet et les sources" -+ echo " -kw, --keep-work garde les dossiers de travail" -+ echo " -kl, --keep-locale garde les autres locales que celles prédéfinies" -+ echo " -cf, --config-file utiliser un fichier de configuration spécifique" -+ echo " -v, --version affiche uniquement la version " -+ echo " -h, --help affiche uniquement l'aide" -+} -+remove_locale() { -+local DIR FILE -+ cd $PKG -+ find . -type d -path "*/share/locale/*" | while read FILE; do -+ if [ `basename $FILE` = $PKGMK_LOCALES ]; then -+ DIR=`dirname "$FILE"` -+ mv "$FILE" . -+ rm -rf $DIR -+ mkdir $DIR -+ mv `basename "$FILE"` $DIR/ -+ break -+ else -+ rm -rf $FILE -+ fi -+ -+ done - } -- - parse_options() { - while [ "$1" ]; do - case $1 in -@@ -589,6 +628,8 @@ - PKGMK_CLEAN="yes" ;; - -kw|--keep-work) - PKGMK_KEEP_WORK="yes" ;; -+ -kl|--keep-locale) -+ PKGMK_KEEP_LOCALES="yes" ;; - -cf|--config-file) - if [ ! "$2" ]; then - echo "`basename $PKGMK_COMMAND`: option $1 requires an argument" -@@ -735,6 +776,8 @@ - PKGMK_CHECK_MD5SUM="no" - PKGMK_NO_STRIP="no" - PKGMK_CLEAN="no" -+PKGMK_KEEP_LOCALES="no" -+PKGMK_LOCALES="fr" - - main "$@" - ---- pkgutils-5.35.0-original/pkgmk.conf 2010-06-26 18:46:59.000000000 +0200 -+++ pkgutils-5.35.0/pkgmk.conf 2010-08-21 16:31:12.000000000 +0200 -@@ -2,18 +2,19 @@ - # /etc/pkgmk.conf: pkgmk(8) configuration - # - --export CFLAGS="-O2 -march=i686 -pipe" --export CXXFLAGS="-O2 -march=i686 -pipe" -+export CFLAGS="-O2 -march=native -pipe" -+export CXXFLAGS="-O2 -march=native -pipe" - - # PKGMK_SOURCE_MIRRORS=() --# PKGMK_SOURCE_DIR="$PWD" --# PKGMK_PACKAGE_DIR="$PWD" --# PKGMK_WORK_DIR="$PWD/work" -+PKGMK_SOURCE_DIR="/srv/sources" -+PKGMK_PACKAGE_DIR="/srv/NuTyX/locale" -+PKGMK_WORK_DIR="/tmp/work" - # PKGMK_DOWNLOAD="no" - # PKGMK_IGNORE_FOOTPRINT="no" - # PKGMK_IGNORE_NEW="no" - # PKGMK_NO_STRIP="no" - # PKGMK_WGET_OPTS="" --# PKGMK_COMPRESSION_MODE="gz" -+PKGMK_COMPRESSION_MODE="xz" -+PKGMK_LOCALES="fr" - - # End of file diff --git a/base/pkgutils/nutyx-attapu.2.patch b/base/pkgutils/nutyx-attapu.2.patch new file mode 100644 index 000000000..b319e5f87 --- /dev/null +++ b/base/pkgutils/nutyx-attapu.2.patch @@ -0,0 +1,169 @@ +--- pkgutils-5.35.0-original/pkgmk.in 2010-06-26 18:46:59.000000000 +0200 ++++ pkgutils-5.35.0/pkgmk.in 2010-08-21 16:20:34.000000000 +0200 +@@ -20,6 +20,7 @@ + # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + # USA. + # ++# Adjusted for NuTyX 2009.1 by thierryn1 at hispeed dot ch + + ## + # error codes +@@ -294,13 +295,30 @@ + + cd $PKG + +- find . -type f -path "*/man/man*/*" | while read FILE; do ++ find . -type f -path "*/share/man*/*" | while read FILE; do + if [ "$FILE" = "${FILE%%.gz}" ]; then + gzip -9 "$FILE" + fi + done + +- find . -type l -path "*/man/man*/*" | while read FILE; do ++ find . -type l -path "*/share/man*/*" | while read FILE; do ++ TARGET=`readlink -n "$FILE"` ++ TARGET="${TARGET##*/}" ++ TARGET="${TARGET%%.gz}.gz" ++ rm -f "$FILE" ++ FILE="${FILE%%.gz}.gz" ++ DIR=`dirname "$FILE"` ++ ++ if [ -e "$DIR/$TARGET" ]; then ++ ln -sf "$TARGET" "$FILE" ++ fi ++ done ++ find . -type f -path "*/share/info/*" | while read FILE; do ++ if [ "$FILE" = "${FILE%%.gz}" ]; then ++ gzip -9 "$FILE" ++ fi ++ done ++ find . -type l -path "*/share/info/*" | while read FILE; do + TARGET=`readlink -n "$FILE"` + TARGET="${TARGET##*/}" + TARGET="${TARGET%%.gz}.gz" +@@ -392,7 +410,11 @@ + fi + + compress_manpages +- ++ ++ if [ "$PKGMK_KEEP_LOCALES" == "no" ]; then ++ remove_locale ++ fi ++ + cd $PKG + info "Build result:" + +@@ -529,28 +551,45 @@ + print_help() { + echo "usage: `basename $PKGMK_COMMAND` [options]" + echo "options:" +- echo " -i, --install build and install package" +- echo " -u, --upgrade build and install package (as upgrade)" +- echo " -r, --recursive search for and build packages recursively" +- echo " -d, --download download missing source file(s)" +- echo " -do, --download-only do not build, only download missing source file(s)" +- echo " -eo, --extract-only do not build, only extract source file(s)" +- echo " -utd, --up-to-date do not build, only check if package is up to date" +- echo " -uf, --update-footprint update footprint using result from last build" +- echo " -if, --ignore-footprint build package without checking footprint" +- echo " -in, --ignore-new build package, ignore new files in a footprint missmatch" +- echo " -um, --update-md5sum update md5sum" +- echo " -im, --ignore-md5sum build package without checking md5sum" +- echo " -cm, --check-md5sum do not build, only check md5sum" +- echo " -ns, --no-strip do not strip executable binaries or libraries" +- echo " -f, --force build package even if it appears to be up to date" +- echo " -c, --clean remove package and downloaded files" +- echo " -kw, --keep-work keep temporary working directory" +- echo " -cf, --config-file use alternative configuration file" +- echo " -v, --version print version and exit " +- echo " -h, --help print help and exit" ++ echo " -i, --install compile et installe le paquet" ++ echo " -u, --upgrade compile et installe le paquet (met à jour)" ++ echo " -r, --recursive recherche et compile les paquets de façon récursive" ++ echo " -d, --download télécharge les fichiers sources manquants" ++ echo " -do, --download-only télécharge uniquement les fichiers sources sans compiler" ++ echo " -eo, --extract-only extrait uniquement les source sans construire le paquet" ++ echo " -utd, --up-to-date véridie uniquement si le paquet est à jour" ++ echo " -uf, --update-footprint met à jour la signature du paquet résultant de la dernière compilation" ++ echo " -if, --ignore-footprint compile le paquet en ignorant la signature" ++ echo " -in, --ignore-new compile le paquet en ignorant la nouvelle signature" ++ echo " -um, --update-md5sum met à jour le md5sum" ++ echo " -im, --ignore-md5sum compile le paquet en ignorant le md5sum" ++ echo " -cm, --check-md5sum vérifie seulement le md5sum" ++ echo " -ns, --no-strip ne réduit pas les binairess ou librairies" ++ echo " -f, --force force la compilation même si le paquet est à jour" ++ echo " -c, --clean supprime le paquet et les sources" ++ echo " -kw, --keep-work garde les dossiers de travail" ++ echo " -kl, --keep-locale garde les autres locales que celles prédéfinies" ++ echo " -cf, --config-file utiliser un fichier de configuration spécifique" ++ echo " -v, --version affiche uniquement la version " ++ echo " -h, --help affiche uniquement l'aide" ++} ++remove_locale() { ++local DIR FILE ++ cd $PKG ++ find . -type d -path "*/share/locale/*" | while read FILE; do ++ if [ `basename $FILE` = $PKGMK_LOCALES ]; then ++ DIR=`dirname "$FILE"` ++ mv "$FILE" . ++ rm -rf $DIR ++ mkdir $DIR ++ mv `basename "$FILE"` $DIR/ ++ break ++ else ++ rm -rf $FILE ++ fi ++ ++ done + } +- + parse_options() { + while [ "$1" ]; do + case $1 in +@@ -589,6 +628,8 @@ + PKGMK_CLEAN="yes" ;; + -kw|--keep-work) + PKGMK_KEEP_WORK="yes" ;; ++ -kl|--keep-locale) ++ PKGMK_KEEP_LOCALES="yes" ;; + -cf|--config-file) + if [ ! "$2" ]; then + echo "`basename $PKGMK_COMMAND`: option $1 requires an argument" +@@ -735,6 +776,8 @@ + PKGMK_CHECK_MD5SUM="no" + PKGMK_NO_STRIP="no" + PKGMK_CLEAN="no" ++PKGMK_KEEP_LOCALES="no" ++PKGMK_LOCALES="fr" + + main "$@" + +--- pkgutils-5.35.0-original/pkgmk.conf 2010-06-26 18:46:59.000000000 +0200 ++++ pkgutils-5.35.0/pkgmk.conf 2010-08-21 16:31:12.000000000 +0200 +@@ -2,18 +2,19 @@ + # /etc/pkgmk.conf: pkgmk(8) configuration + # + +-export CFLAGS="-O2 -march=i686 -pipe" +-export CXXFLAGS="-O2 -march=i686 -pipe" ++export CFLAGS="-O2 -march=native -pipe" ++export CXXFLAGS="-O2 -march=native -pipe" + + # PKGMK_SOURCE_MIRRORS=() +-# PKGMK_SOURCE_DIR="$PWD" +-# PKGMK_PACKAGE_DIR="$PWD" +-# PKGMK_WORK_DIR="$PWD/work" ++PKGMK_SOURCE_DIR="/srv/sources" ++# PKGMK_PACKAGE_DIR="$PWD" ++PKGMK_WORK_DIR="/tmp/work" + # PKGMK_DOWNLOAD="no" + # PKGMK_IGNORE_FOOTPRINT="no" + # PKGMK_IGNORE_NEW="no" + # PKGMK_NO_STRIP="no" + # PKGMK_WGET_OPTS="" +-# PKGMK_COMPRESSION_MODE="gz" ++PKGMK_COMPRESSION_MODE="xz" ++PKGMK_LOCALES="fr" + + # End of file -- cgit v1.2.3-54-g00ecf From a9fd14f65e9135ab32dac7eff76464050236e394 Mon Sep 17 00:00:00 2001 From: tnut Date: Wed, 8 Sep 2010 22:47:30 +0200 Subject: maj pkg-get#0.5.1-2 --- base/pkg-get/.md5sum | 4 ++-- base/pkg-get/Pkgfile | 2 +- base/pkg-get/pkg-get.conf | 12 ------------ base/pkg-get/syn | 38 ++++++++++++++++++++++++++++---------- 4 files changed, 31 insertions(+), 25 deletions(-) (limited to 'base') diff --git a/base/pkg-get/.md5sum b/base/pkg-get/.md5sum index 14eba5747..6469b32ef 100644 --- a/base/pkg-get/.md5sum +++ b/base/pkg-get/.md5sum @@ -1,3 +1,3 @@ 91a314edd2a2ba5dca5bbe7472521ccf pkg-get-0.5.1.tar.gz -a28fcf9580524d8865e05b223afa738f pkg-get.conf -1d8f66bd8d6ff3ac4f3486efdbc453dd syn +1739a7c851834393f8e0bd216cb1f137 pkg-get.conf +1571a08b2de3ed77babb7b5ecae4c2a6 syn diff --git a/base/pkg-get/Pkgfile b/base/pkg-get/Pkgfile index b42f44a16..a54678b3d 100644 --- a/base/pkg-get/Pkgfile +++ b/base/pkg-get/Pkgfile @@ -5,7 +5,7 @@ name=pkg-get version=0.5.1 -release=1 +release=2 source=(http://kiao.no-ip.info/NuTyX/files/$name-$version.tar.gz \ pkg-get.conf syn) diff --git a/base/pkg-get/pkg-get.conf b/base/pkg-get/pkg-get.conf index 5c32b5f5e..e19dab3a2 100644 --- a/base/pkg-get/pkg-get.conf +++ b/base/pkg-get/pkg-get.conf @@ -3,18 +3,6 @@ # # pkg-get configuration file # Dépot des paquets NuTyX - -# ********************************************************************** -# * Explications * -# ********************************************************************** - -# Par défault, seul le dépot "release" est activé. - -# Si vous souhaitez inclure vos propre paquets binaires lors de la prochaine -# demande de mise à jour via la commande "check", -# veuillez alors décommenter la ligne ci-dessous -# pkgdir /srv/NuTyX/locale - pkgdir /srv/NuTyX/release|http://nutyx.meticul.eu/attapu/uname-m/release # runscripts: if "yes" pre-post install scripts are # automatically executed. Handle with care. diff --git a/base/pkg-get/syn b/base/pkg-get/syn index 70beace61..d29fcd6f7 100644 --- a/base/pkg-get/syn +++ b/base/pkg-get/syn @@ -1,16 +1,32 @@ #!/bin/bash MediaDepot=/media/cdrom/depot Depot=/srv/NuTyX +find_cd() { +EXPECT_LABEL="nutyxcd" +let PKGNB=0 +for SYS in /sys/block/sd* /sys/block/sr* ; do + if [ ! -d "$SYS" ]; then continue; fi + DEV=/dev/${SYS##*/} + LABEL=`dd if=$DEV bs=1 skip=32808 count=32 2>/dev/null` + if [ $LABEL == $EXPECT_LABEL ] 2>/dev/null ; then + mkdir -p /media/cdrom 2>/dev/null + mount $DEV /media/cdrom + if [ ! -d /media/cdrom/depot ]; then + umount -n /media/cdrom + fi + break + fi +done +} if [ ! "$EUID" -eq 0 ]; then echo "Seul le compte root peut synchroniser les ports NuTyX" exit 1 fi +if ! mountpoint /media/cdrom > /dev/null; then + find_cd +fi if [ ! -L /depot ]; then - if [ ! -d $Depot/locale ]; then mkdir -p $Depot/locale; fi - pushd $Depot/locale > /dev/null - pkg-repgen - popd - for i in test release + for i in `cat /etc/pkg-get.conf |grep -v ^#|grep http|cut -d "|" -f 1|cut -d" " -f2|cut -d"/" -f4` do if [ -a $Depot/$i ]; then rm -r $Depot/$i @@ -20,14 +36,17 @@ if [ ! -L /depot ]; then for i in `cat /etc/pkg-get.conf |grep -v ^#|grep http|cut -d "|" -f 1|cut -d" " -f2|cut -d"/" -f4` do if [ -d $MediaDepot/$i ]; then - echo "Dépot $i trouvé sur le media" rm -r $Depot/$i > /dev/null 2>&1 mkdir -p $Depot/$i - for j in $MediaDepot/$i/*.gz + for j in $MediaDepot/$i/*.xz do + let PKGNB=$PKGNB+1 + fj=`basename $j` - ln -svf $MediaDepot/$i/$fj $Depot/$i/$fj > /dev/null + ln -sf $MediaDepot/$i/$fj $Depot/$i/$fj + echo -n -e "$PKGNB Paquets trouvés sur le média\r" done + echo "$PKGNB Paquets trouvés sur le média" cp $MediaDepot/$i/PKG* $Depot/$i/ fi done @@ -36,5 +55,4 @@ else do rsync -avuz --delete-before rsync://nutyx.meticul.eu/nutyx/attapu/i686/$i/ $Depot/$i/ done -fi - +fi -- cgit v1.2.3-54-g00ecf