Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=78be5954e00fbdd172152a50a8e81da6cafa05d2
commit 78be5954e00fbdd172152a50a8e81da6cafa05d2 Author: Miklos Vajna <[EMAIL PROTECTED]> Date: Wed Dec 26 18:05:27 2007 +0100 move sysconfdir/pacman.d to sysconfdir/pacman-g2/repos hopefully this is the last cosmetic rename :) diff --git a/TODO b/TODO index a9ca180..61c6f90 100644 --- a/TODO +++ b/TODO @@ -24,8 +24,6 @@ G2 TODO ======= - Review #1079 (BTS) and maybe implement it -- untouched dirs from pacman: - - pacman.d - Review stuffs which gives warnings when using --enable-strict and fix those. diff --git a/configure.ac b/configure.ac index aa9234c..14564de 100644 --- a/configure.ac +++ b/configure.ac @@ -432,11 +432,11 @@ src/versort/Makefile scripts/Makefile doc/Makefile etc/Makefile -etc/pacman.d/Makefile -etc/pacman.d/frugalware -etc/pacman.d/frugalware-current etc/pacman-g2/Makefile etc/pacman-g2/hooks/Makefile +etc/pacman-g2/repos/Makefile +etc/pacman-g2/repos/frugalware +etc/pacman-g2/repos/frugalware-current bindings/perl/Makefile bindings/python/Makefile bindings/java/Makefile diff --git a/dist/FrugalBuild.in b/dist/FrugalBuild.in index 8dd40d8..f1b1204 100644 --- a/dist/FrugalBuild.in +++ b/dist/FrugalBuild.in @@ -6,7 +6,7 @@ [EMAIL PROTECTED]@ pkgrel=1 pkgdesc="A .tar.bz2 based package manager library (libpacman) and client (pacman-g2) with dependency support." url="http://ftp.frugalware.org/pub/other/pacman-g2/"; -backup=(etc/{makepkg,pacman}.conf etc/pacman.d/{frugalware,frugalware-current}) +backup=(etc/{makepkg,pacman-g2}.conf etc/pacman-g2/repos/{frugalware,frugalware-current}) depends=('libarchive>=2.0.27') makedepends=('doxygen' 'po4a' 'swig' 'java-gcj-compat' 'ecj' 'mono') Finclude mono diff --git a/doc/pacman-g2.txt b/doc/pacman-g2.txt index acf4908..29d16a0 100644 --- a/doc/pacman-g2.txt +++ b/doc/pacman-g2.txt @@ -301,7 +301,7 @@ Example: HoldPkg = pacman-g2 glibc bash coreutils HoldPkg = chkconfig -Include = /etc/pacman.d/frugalware-current +Include = /etc/pacman-g2/repos/frugalware-current [custom] Server = file:///home/pkgs diff --git a/etc/Makefile.am b/etc/Makefile.am index 92550e4..52716e0 100644 --- a/etc/Makefile.am +++ b/etc/Makefile.am @@ -1,3 +1,3 @@ -SUBDIRS = pacman.d pacman-g2 +SUBDIRS = pacman-g2 EXTRA_DIST = makepkg.conf pacman-g2.conf dist_sysconf_DATA = makepkg.conf pacman-g2.conf diff --git a/etc/pacman-g2/Makefile.am b/etc/pacman-g2/Makefile.am index 4df5822..0a1ec22 100644 --- a/etc/pacman-g2/Makefile.am +++ b/etc/pacman-g2/Makefile.am @@ -1 +1 @@ -SUBDIRS = hooks +SUBDIRS = hooks repos diff --git a/etc/pacman-g2/repos/.gitignore b/etc/pacman-g2/repos/.gitignore new file mode 100644 index 0000000..d611e36 --- /dev/null +++ b/etc/pacman-g2/repos/.gitignore @@ -0,0 +1,2 @@ +frugalware +frugalware-current diff --git a/etc/pacman-g2/repos/frugalware-current.in b/etc/pacman-g2/repos/frugalware-current.in new file mode 100644 index 0000000..a5568b1 --- /dev/null +++ b/etc/pacman-g2/repos/frugalware-current.in @@ -0,0 +1,44 @@ +# +# frugalware-current repository +# + +[frugalware-current] +# ----------- +# - BELGIUM - +# ----------- +# Belgian National Research Network (1 GBit) +Server = ftp://ftp5.frugalware.org/packages/frugalware/pub/frugalware/frugalware-current/[EMAIL PROTECTED]@ +# ------------- +# - AUSTRALIA - +# ------------- +# PlanetMirror (Unknown bandwidth) +Server = ftp://ftp13.frugalware.org/pub/frugalware/frugalware-current/[EMAIL PROTECTED]@ +# ----------- +# - GERMANY - +# ----------- +# Sebastian Vassiliou (100 MBit) +Server = http://www7.frugalware.org/pub/frugalware/frugalware-current/[EMAIL PROTECTED]@ +# ----------- +# - HUNGARY - +# ----------- +# Schmidt Computer Ltd. (100 MBit) +Server = ftp://ftp3.frugalware.org/mirrors/frugalware/pub/frugalware/frugalware-current/[EMAIL PROTECTED]@ +# Free Software Network (100 MBit) +Server = ftp://ftp4.frugalware.org/pub/linux/distributions/frugalware/frugalware-current/[EMAIL PROTECTED]@ +# ----------- +# - IRELAND - +# ----------- +# Ireland's National Education and Research Network (2 GBit) +Server = ftp://ftp12.frugalware.org/mirrors/ftp.frugalware.org/pub/frugalware/frugalware-current/[EMAIL PROTECTED]@ +# ---------- +# - TAIWAN - +# ---------- +# National Taiwan University (Unknown bandwidth) +Server = ftp://ftp9.frugalware.org/pub/frugalware/frugalware-current/[EMAIL PROTECTED]@ +# ------- +# - USA - +# ------- +# SourceMirrors (100 MBit) +Server = ftp://ftp6.frugalware.org/pub/linux/frugalware/frugalware-current/[EMAIL PROTECTED]@ +# TDS Telecom (1 GBit) +Server = ftp://ftp10.frugalware.org/pub/linux/frugalware/frugalware-current/[EMAIL PROTECTED]@ diff --git a/etc/pacman.d/.gitignore b/etc/pacman.d/.gitignore deleted file mode 100644 index d611e36..0000000 --- a/etc/pacman.d/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -frugalware -frugalware-current diff --git a/etc/pacman.d/Makefile.am b/etc/pacman.d/Makefile.am deleted file mode 100644 index e5263b4..0000000 --- a/etc/pacman.d/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -EXTRA_DIST = frugalware frugalware-current - -install-data-hook: - mkdir -p $(DESTDIR)$(sysconfdir)/pacman.d ; \ - for j in $(EXTRA_DIST); do \ - $(INSTALL) -c -m 644 $(srcdir)/$$j $(DESTDIR)$(sysconfdir)/pacman.d/$$j ; \ - done - -uninstall-hook: - for j in $(EXTRA_DIST); do \ - rm -f $(DESTDIR)$(sysconfdir)/pacman.d/$$j ; \ - done diff --git a/etc/pacman.d/frugalware-current.in b/etc/pacman.d/frugalware-current.in deleted file mode 100644 index a5568b1..0000000 --- a/etc/pacman.d/frugalware-current.in +++ /dev/null @@ -1,44 +0,0 @@ -# -# frugalware-current repository -# - -[frugalware-current] -# ----------- -# - BELGIUM - -# ----------- -# Belgian National Research Network (1 GBit) -Server = ftp://ftp5.frugalware.org/packages/frugalware/pub/frugalware/frugalware-current/[EMAIL PROTECTED]@ -# ------------- -# - AUSTRALIA - -# ------------- -# PlanetMirror (Unknown bandwidth) -Server = ftp://ftp13.frugalware.org/pub/frugalware/frugalware-current/[EMAIL PROTECTED]@ -# ----------- -# - GERMANY - -# ----------- -# Sebastian Vassiliou (100 MBit) -Server = http://www7.frugalware.org/pub/frugalware/frugalware-current/[EMAIL PROTECTED]@ -# ----------- -# - HUNGARY - -# ----------- -# Schmidt Computer Ltd. (100 MBit) -Server = ftp://ftp3.frugalware.org/mirrors/frugalware/pub/frugalware/frugalware-current/[EMAIL PROTECTED]@ -# Free Software Network (100 MBit) -Server = ftp://ftp4.frugalware.org/pub/linux/distributions/frugalware/frugalware-current/[EMAIL PROTECTED]@ -# ----------- -# - IRELAND - -# ----------- -# Ireland's National Education and Research Network (2 GBit) -Server = ftp://ftp12.frugalware.org/mirrors/ftp.frugalware.org/pub/frugalware/frugalware-current/[EMAIL PROTECTED]@ -# ---------- -# - TAIWAN - -# ---------- -# National Taiwan University (Unknown bandwidth) -Server = ftp://ftp9.frugalware.org/pub/frugalware/frugalware-current/[EMAIL PROTECTED]@ -# ------- -# - USA - -# ------- -# SourceMirrors (100 MBit) -Server = ftp://ftp6.frugalware.org/pub/linux/frugalware/frugalware-current/[EMAIL PROTECTED]@ -# TDS Telecom (1 GBit) -Server = ftp://ftp10.frugalware.org/pub/linux/frugalware/frugalware-current/[EMAIL PROTECTED]@ diff --git a/etc/pacman.d/frugalware.in b/etc/pacman.d/frugalware.in deleted file mode 100644 index 8047d93..0000000 --- a/etc/pacman.d/frugalware.in +++ /dev/null @@ -1,44 +0,0 @@ -# -# frugalware-stable repository -# - -[frugalware] -# ----------- -# - BELGIUM - -# ----------- -# Belgian National Research Network (1 GBit) -Server = ftp://ftp5.frugalware.org/packages/frugalware/pub/frugalware/frugalware-stable/[EMAIL PROTECTED]@ -# ------------- -# - AUSTRALIA - -# ------------- -# PlanetMirror (Unknown bandwidth) -Server = ftp://ftp13.frugalware.org/pub/frugalware/frugalware-stable/[EMAIL PROTECTED]@ -# ----------- -# - GERMANY - -# ----------- -# Sebastian Vassiliou (100 MBit) -Server = http://www7.frugalware.org/pub/frugalware/frugalware-stable/[EMAIL PROTECTED]@ -# ----------- -# - HUNGARY - -# ----------- -# Schmidt Computer Ltd. (100 MBit) -Server = ftp://ftp3.frugalware.org/mirrors/frugalware/pub/frugalware/frugalware-stable/[EMAIL PROTECTED]@ -# Free Software Network (100 MBit) -Server = ftp://ftp4.frugalware.org/pub/linux/distributions/frugalware/frugalware-stable/[EMAIL PROTECTED]@ -# ----------- -# - IRELAND - -# ----------- -# Ireland's National Education and Research Network (2 GBit) -Server = ftp://ftp12.frugalware.org/mirrors/ftp.frugalware.org/pub/frugalware/frugalware-stable/[EMAIL PROTECTED]@ -# ---------- -# - TAIWAN - -# ---------- -# National Taiwan University (Unknown bandwidth) -Server = ftp://ftp9.frugalware.org/pub/frugalware/frugalware-stable/[EMAIL PROTECTED]@ -# ------- -# - USA - -# ------- -# SourceMirrors (100 MBit) -Server = ftp://ftp6.frugalware.org/pub/linux/frugalware/frugalware-stable/[EMAIL PROTECTED]@ -# TDS Telecom (1 GBit) -Server = ftp://ftp10.frugalware.org/pub/linux/frugalware/frugalware-stable/[EMAIL PROTECTED]@ diff --git a/scripts/makepkg b/scripts/makepkg index 28cf8a8..df9256f 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -791,8 +791,8 @@ if [ ! -z "$DOWNLOAD" -a "$INFAKEROOT" != "1" ]; then # searching for a mirror repo=`pacman-g2 -Si $DOWNLOAD |grep ^Repo |sed -n 's/.* \([^ ]*\)/\1/;1 p'` - dir=`grep ^Server /etc/pacman.d/$repo |sed -n 's/.* = \(.*\)/\1/;1 p'` - arch=`grep ^Server /etc/pacman.d/$repo |sed -n 's/.*-\(.*\)/\1/;1 p'` + dir=`grep ^Server /etc/pacman-g2/repos/$repo |sed -n 's/.* = \(.*\)/\1/;1 p'` + arch=`grep ^Server /etc/pacman-g2/repos/$repo |sed -n 's/.*-\(.*\)/\1/;1 p'` cat=`pacman-g2 -Si $DOWNLOAD |grep ^G |sed 's/.* : \([^ ]*\) .*/\1/;'` dlpath="$dir/../" @@ -985,7 +985,7 @@ if [ "$CHROOT" = "1" -a "$INCHROOT" != "1" ]; then do repo=$(eval "echo \${${i}_$DB_EXT/.$DB_EXT}") [ -z "$repo" ] && repo="$i" - echo "Include = /etc/pacman.d/$repo" >>$_F_makepkg_pacconf + echo "Include = /etc/pacman-g2/repos/$repo" >>$_F_makepkg_pacconf done mkdir -p $CHROOTDIR/{tmp,var/log} pacman-g2 -r "$CHROOTDIR" -Syf $COREPKGS --noconfirm --config $_F_makepkg_pacconf @@ -1014,7 +1014,7 @@ if [ "$CHROOT" = "1" -a "$INCHROOT" != "1" ]; then chmod 1777 $CHROOTDIR/{var,}/tmp msg "Copying config files to chroot" - cp -pf /etc/pacman.d/* $CHROOTDIR/etc/pacman.d >/dev/null & + cp -pf /etc/pacman-g2/repos/* $CHROOTDIR/etc/pacman-g2/repos >/dev/null & for i in makepkg.conf resolv.conf passwd shadow group fstab mtab do cp -pf /etc/$i $CHROOTDIR/etc >/dev/null & _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
