From 7d6e9b08d749983263ed3ee890f73d13e73740c8 Mon Sep 17 00:00:00 2001
From: Nicolas Reynolds <fauno@kiwwwi.com.ar>
Date: Sun, 5 Feb 2012 02:45:18 -0300
Subject: Make treepkg run HOOKLOCALRELEASE and mipsrelease update the
 databases

treepkg should stay away of updating databases, since it can be used inside or
outside the chroot. (updating dbs from outside is unnecessary)
---
 mips64el/mipsrelease | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'mips64el/mipsrelease')

diff --git a/mips64el/mipsrelease b/mips64el/mipsrelease
index 1a4aade..e1035aa 100755
--- a/mips64el/mipsrelease
+++ b/mips64el/mipsrelease
@@ -57,4 +57,6 @@ popd >/dev/null
 
 $libretoolsdir/chcleanup || true
 
+sudo pacman -Sy
+
 exit $?
-- 
cgit v1.2.3-54-g00ecf


From 94b94c9ea476e4e791219bd2c017741a3274bbc5 Mon Sep 17 00:00:00 2001
From: Nicolas Reynolds <fauno@kiwwwi.com.ar>
Date: Mon, 6 Feb 2012 02:26:50 -0300
Subject: Treepkg guess repo and put it on BUILDORDER. Also remove
 libremessages since libretools.conf does this for us.

---
 mips64el/mipsrelease |  5 +++--
 treepkg              | 18 ++++++++++++++----
 2 files changed, 17 insertions(+), 6 deletions(-)

(limited to 'mips64el/mipsrelease')

diff --git a/mips64el/mipsrelease b/mips64el/mipsrelease
index e1035aa..0d14c72 100755
--- a/mips64el/mipsrelease
+++ b/mips64el/mipsrelease
@@ -48,6 +48,9 @@ done
 
 repo-add ${PKGDEST}/stage3.db.tar.gz ${pkgs[@]}
 
+sudo pacman -Sy
+librestage ${repo}
+
 
 mkdir -p ${WORKDIR}/abs/${CARCH}/${repo} >/dev/null
 
@@ -57,6 +60,4 @@ popd >/dev/null
 
 $libretoolsdir/chcleanup || true
 
-sudo pacman -Sy
-
 exit $?
diff --git a/treepkg b/treepkg
index 376af91..167ccbd 100755
--- a/treepkg
+++ b/treepkg
@@ -1,9 +1,12 @@
 #!/bin/bash
 #set -x
 source /etc/libretools.conf
-source $(dirname $0)/libremessages
 source $XDG_CONFIG_HOME/libretools/libretools.conf >/dev/null 2>&1|| true
 
+# Get system variables
+source /etc/makepkg.conf
+source $HOME/makepkg.conf >/dev/null 2>&1|| true
+
 # End inmediately but print a useful message
 trap_exit() {
   error "($(basename $0)) $@"
@@ -32,7 +35,7 @@ get_fullver() {
 # $1 status
 # $2 pkgname
 add_order() {
-  echo "${1};${DEPTH};${2:-${pkgbase}};${fullver};${PWD}" >> "${BUILDORDER}"
+  echo "${1};${DEPTH};${2:-${pkgbase}};${fullver};${PWD};$(guess_repo "$PWD")" >> "${BUILDORDER}"
   ${VERBOSE} && msg2 "%${DEPTH}s${2:-${pkgbase}} [${1}]" || true
 }
 
@@ -44,8 +47,14 @@ where_is() {
     cut -d: -f2 2>/dev/null
 }
 
+# Guess the repo from the pkgbase path
+# $1 path, pwd or where_is
+guess_repo() {
+    basename "$(dirname "${1}")"
+}
+
 if [ ! -f PKGBUILD ]; then
-  error "Missing PKGBUILD"
+  error "Missing PKGBUILD ($PWD)"
   exit 1
 fi
 
@@ -148,7 +157,8 @@ if [ ${DEPTH} -eq 0 ]; then
 # Run build command
       pushd "${BUILDDIR}/${_pkg}" >/dev/null
         ${FULLBUILDCMD}
-        ${HOOKLOCALRELEASE}
+# Run local release hook with $1 = $repo
+        ${HOOKLOCALRELEASE} $(egrep ";${_pkg};" "${BUILDORDER}" | cut -d';' -f6)
       popd >/dev/null
     done
 
-- 
cgit v1.2.3-54-g00ecf


From ebc66c503aad4df99f8660f2e4557c23cdc24fd3 Mon Sep 17 00:00:00 2001
From: Nicolas Reynolds <fauno@kiwwwi.com.ar>
Date: Mon, 6 Feb 2012 03:00:34 -0300
Subject: _pkg contained the depth also

---
 mips64el/mipsrelease | 5 +++++
 treepkg              | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'mips64el/mipsrelease')

diff --git a/mips64el/mipsrelease b/mips64el/mipsrelease
index 0d14c72..5d0034d 100755
--- a/mips64el/mipsrelease
+++ b/mips64el/mipsrelease
@@ -34,6 +34,11 @@ get_full_version() {
 
 repo=$1; shift
 
+if [ -z "${repo}" ]; then
+    error "Empty repo"
+    exit 1
+fi
+
 # Get all needed sources
 source PKGBUILD
 fullver=$(get_full_version ${epoch:-0} ${pkgver} ${pkgrel})
diff --git a/treepkg b/treepkg
index 167ccbd..bd95253 100755
--- a/treepkg
+++ b/treepkg
@@ -158,7 +158,7 @@ if [ ${DEPTH} -eq 0 ]; then
       pushd "${BUILDDIR}/${_pkg}" >/dev/null
         ${FULLBUILDCMD}
 # Run local release hook with $1 = $repo
-        ${HOOKLOCALRELEASE} $(egrep ";${_pkg};" "${BUILDORDER}" | cut -d';' -f6)
+        ${HOOKLOCALRELEASE} $(egrep ";${_pkg#*_};" "${BUILDORDER}" | cut -d';' -f6)
       popd >/dev/null
     done
 
-- 
cgit v1.2.3-54-g00ecf


From 875ec16b3d25c2b4d9dc5c940702f5ecde76cf7f Mon Sep 17 00:00:00 2001
From: Nicolas Reynolds <fauno@kiwwwi.com.ar>
Date: Tue, 14 Feb 2012 11:41:40 -0300
Subject: Update the system before building

---
 mips64el/mipsrelease | 2 +-
 treepkg              | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'mips64el/mipsrelease')

diff --git a/mips64el/mipsrelease b/mips64el/mipsrelease
index 5d0034d..f245c47 100755
--- a/mips64el/mipsrelease
+++ b/mips64el/mipsrelease
@@ -53,7 +53,7 @@ done
 
 repo-add ${PKGDEST}/stage3.db.tar.gz ${pkgs[@]}
 
-sudo pacman -Sy
+#sudo pacman -Sy
 librestage ${repo}
 
 
diff --git a/treepkg b/treepkg
index b3e4fe0..a49301e 100755
--- a/treepkg
+++ b/treepkg
@@ -185,6 +185,8 @@ if [ ${DEPTH} -eq 0 ]; then
 
 # Run build command
       pushd "${BUILDDIR}/${_pkg}" >/dev/null
+        sudo pacman -Syu
+
         ${FULLBUILDCMD}
 # Run local release hook with $1 = $repo
         ${HOOKLOCALRELEASE} $(egrep ";${_pkg#*_};" "${BUILDORDER}" | cut -d';' -f6)
-- 
cgit v1.2.3-54-g00ecf