From d53eb17446015198234829e42721fa22b5991769 Mon Sep 17 00:00:00 2001
From: Nicolás Reynolds <apoyosis@correo.inta.gob.ar>
Date: Wed, 18 May 2011 15:42:56 -0300
Subject: 2011.05.28 release\!

---
 Makefile                        |  8 ++++----
 overlay/etc/pacman.conf         | 14 ++++++++------
 overlay/etc/pacman.d/mirrorlist |  2 +-
 packages.i686                   |  2 --
 packages.x86_64                 |  2 --
 5 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index 77505c6..2bec1f8 100644
--- a/Makefile
+++ b/Makefile
@@ -27,9 +27,9 @@ core-iso: $(COREname)
 net-iso: $(NETname)
 
 $(COREname): core-pkgs base-fs
-	mkarchiso -v -L $(LABEL) -P $(PUBLISHER) -A $(APPLICATION) -D $(INSTALL_DIR) -c $(COMPRESS) iso $(WORKDIR) $@
+	mkarchiso -v -C $(PACCONFIG) -L $(LABEL) -P $(PUBLISHER) -A $(APPLICATION) -D $(INSTALL_DIR) -c $(COMPRESS) iso $(WORKDIR) $@
 $(NETname): base-fs
-	mkarchiso -v -L $(LABEL) -P $(PUBLISHER) -A $(APPLICATION) -D $(INSTALL_DIR) -c $(COMPRESS) iso $(WORKDIR) $@
+	mkarchiso -v -C $(PACCONFIG) -L $(LABEL) -P $(PUBLISHER) -A $(APPLICATION) -D $(INSTALL_DIR) -c $(COMPRESS) iso $(WORKDIR) $@
 
 # This is the main rule for make the working filesystem.
 base-fs: root-image bootfiles initcpio overlay iso-mounts
@@ -38,8 +38,8 @@ base-fs: root-image bootfiles initcpio overlay iso-mounts
 # Rules for make the root-image for base filesystem.
 root-image: $(WORKDIR)/root-image/.arch-chroot
 $(WORKDIR)/root-image/.arch-chroot:
-	mkarchiso -v -L $(LABEL) -P $(PUBLISHER) -A $(APPLICATION) -D $(INSTALL_DIR) -p base create $(WORKDIR)
-	mkarchiso -v -L $(LABEL) -P $(PUBLISHER) -A $(APPLICATION) -D $(INSTALL_DIR) -p $(PACKAGES) create $(WORKDIR)
+	mkarchiso -v -C $(PACCONFIG) -L $(LABEL) -P $(PUBLISHER) -A $(APPLICATION) -D $(INSTALL_DIR) -p base create $(WORKDIR)
+	mkarchiso -v -C $(PACCONFIG) -L $(LABEL) -P $(PUBLISHER) -A $(APPLICATION) -D $(INSTALL_DIR) -p $(PACKAGES) create $(WORKDIR)
 
 # Rule for make /boot
 bootfiles: root-image
diff --git a/overlay/etc/pacman.conf b/overlay/etc/pacman.conf
index 911c23d..675956d 100644
--- a/overlay/etc/pacman.conf
+++ b/overlay/etc/pacman.conf
@@ -17,7 +17,7 @@ HoldPkg     = pacman glibc
 # If upgrades are available for these packages they will be asked for first
 SyncFirst   = pacman
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
-#XferCommand = /usr/bin/curl -C - %u > %o
+#XferCommand = /usr/bin/curl -C - -f %u > %o
 #CleanMethod = KeepInstalled
 Architecture = auto
 
@@ -33,6 +33,7 @@ Architecture = auto
 #ShowSize
 #UseDelta
 #TotalDownload
+#CheckSpace
 
 #
 # REPOSITORIES
@@ -57,24 +58,25 @@ Architecture = auto
 # repo name header and Include lines. You can add preferred servers immediately
 # after the header, and they will be used before the default mirrors.
 
+#[libre-testing]
+#Include = /etc/pacman.d/mirrorlist
+
+[libre]
+Include = /etc/pacman.d/mirrorlist
+
 #[testing]
-## Add your preferred servers here, they will be used first
 #Include = /etc/pacman.d/mirrorlist
 
 [core]
-# Add your preferred servers here, they will be used first
 Include = /etc/pacman.d/mirrorlist
 
 [extra]
-# Add your preferred servers here, they will be used first
 Include = /etc/pacman.d/mirrorlist
 
 #[community-testing]
-## Add your preferred servers here, they will be used first
 #Include = /etc/pacman.d/mirrorlist
 
 [community]
-# Add your preferred servers here, they will be used first
 Include = /etc/pacman.d/mirrorlist
 
 # An example of a custom package repository.  See the pacman manpage for
diff --git a/overlay/etc/pacman.d/mirrorlist b/overlay/etc/pacman.d/mirrorlist
index 6537e4c..f353d0b 100644
--- a/overlay/etc/pacman.d/mirrorlist
+++ b/overlay/etc/pacman.d/mirrorlist
@@ -1,4 +1,4 @@
 # Parabola GNU/Linux
-Server = http://parabolagnulinux.org/repo/$repo/os/$arch
+Server = http://repo.parabolagnulinux.org/$repo/os/$arch
 Server = ftp://ftp.inf.utfsm.cl/pub/parabola/$repo/os/$arch
 
diff --git a/packages.i686 b/packages.i686
index 432f155..f34f532 100644
--- a/packages.i686
+++ b/packages.i686
@@ -32,8 +32,6 @@ speedtouch
 squashfs-tools
 syslinux
 tcpdump
-tiacx
-tiacx-firmware
 wireless_tools
 wpa_actiond
 wpa_supplicant
diff --git a/packages.x86_64 b/packages.x86_64
index 432f155..f34f532 100644
--- a/packages.x86_64
+++ b/packages.x86_64
@@ -32,8 +32,6 @@ speedtouch
 squashfs-tools
 syslinux
 tcpdump
-tiacx
-tiacx-firmware
 wireless_tools
 wpa_actiond
 wpa_supplicant
-- 
cgit v1.2.3-54-g00ecf