From 16f5e40a3ca2d1140d99e4a585328803db9910a7 Mon Sep 17 00:00:00 2001
From: Joseph Hunkeler <jhunkeler@gmail.com>
Date: Fri, 1 Mar 2019 22:34:27 -0500
Subject: Build git before using it

---
 etc/pkgs/005-git.sh  | 18 ++++++++++++++++++
 etc/pkgs/005-tini.sh | 18 ------------------
 etc/pkgs/006-git.sh  | 18 ------------------
 etc/pkgs/006-tini.sh | 18 ++++++++++++++++++
 4 files changed, 36 insertions(+), 36 deletions(-)
 create mode 100755 etc/pkgs/005-git.sh
 delete mode 100755 etc/pkgs/005-tini.sh
 delete mode 100755 etc/pkgs/006-git.sh
 create mode 100755 etc/pkgs/006-tini.sh

diff --git a/etc/pkgs/005-git.sh b/etc/pkgs/005-git.sh
new file mode 100755
index 0000000..11e27c5
--- /dev/null
+++ b/etc/pkgs/005-git.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+set -xe
+
+name=git
+version=2.20.1
+url=https://mirrors.edge.kernel.org/pub/software/scm/git/${name}-${version}.tar.xz
+
+curl -LO ${url}
+tar xf ${name}-${version}.tar.xz
+
+pushd ${name}-${version}
+    make configure
+    ./configure --prefix=${TOOLCHAIN} \
+        --with-curl \
+        --with-openssl=${TOOLCHAIN}
+    make -j${_maxjobs}
+    make install-strip
+popd
diff --git a/etc/pkgs/005-tini.sh b/etc/pkgs/005-tini.sh
deleted file mode 100755
index 12d44a7..0000000
--- a/etc/pkgs/005-tini.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-set -xe
-
-sudo yum install -y cmake glibc-static || exit 1
-git clone https://github.com/krallin/tini.git
-export CFLAGS="${CFLAGS} -DPR_SET_CHILD_SUBREAPER=36 -DPR_GET_CHILD_SUBREAPER=37"
-
-pushd tini
-    git checkout v0.18.0
-    mkdir -p build
-    pushd build
-        cmake ..
-        make
-        install -m755 tini ${TOOLCHAIN_BIN}
-    popd
-popd
-
-rm -rf tini
diff --git a/etc/pkgs/006-git.sh b/etc/pkgs/006-git.sh
deleted file mode 100755
index 11e27c5..0000000
--- a/etc/pkgs/006-git.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-set -xe
-
-name=git
-version=2.20.1
-url=https://mirrors.edge.kernel.org/pub/software/scm/git/${name}-${version}.tar.xz
-
-curl -LO ${url}
-tar xf ${name}-${version}.tar.xz
-
-pushd ${name}-${version}
-    make configure
-    ./configure --prefix=${TOOLCHAIN} \
-        --with-curl \
-        --with-openssl=${TOOLCHAIN}
-    make -j${_maxjobs}
-    make install-strip
-popd
diff --git a/etc/pkgs/006-tini.sh b/etc/pkgs/006-tini.sh
new file mode 100755
index 0000000..12d44a7
--- /dev/null
+++ b/etc/pkgs/006-tini.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+set -xe
+
+sudo yum install -y cmake glibc-static || exit 1
+git clone https://github.com/krallin/tini.git
+export CFLAGS="${CFLAGS} -DPR_SET_CHILD_SUBREAPER=36 -DPR_GET_CHILD_SUBREAPER=37"
+
+pushd tini
+    git checkout v0.18.0
+    mkdir -p build
+    pushd build
+        cmake ..
+        make
+        install -m755 tini ${TOOLCHAIN_BIN}
+    popd
+popd
+
+rm -rf tini
-- 
cgit