Fix conflicts

diff --git a/build-hc-pkg b/build-hc-pkg
index 1c1fe3201313da574233558fd53bb76088b5dba7..51b56f19d3e7d9f11c5999cf1461a31a284ce132 100755 (executable)
--- a/build-hc-pkg
+++ b/build-hc-pkg
@@ -24,6 +24,17 @@ function detect_number_of_cpus () {
     esac
 }
 
+function detect_gnu_tar () {
+    if which gnutar >/dev/null 2>&1; then
+        echo "gnutar"
+    elif which gtar >/dev/null 2>&1; then
+        echo "gtar"
+    else
+        echo "We need GNU tar to be installed." >&2
+        exit 1
+    fi
+}
+
 function say_hello () {
     local -r platform=$(detect_platform_type)
     local -r n_cpus=$(detect_number_of_cpus)
@@ -61,6 +72,7 @@ function build_hc_pkg () {
         -f mk/main.mk \
         SRCPATH="$srcpath" \
         PLATFORM="$(detect_platform_type)" \
+        GNUTAR="$(detect_gnu_tar)" \
         SHELL="$SHELL"
 
     echo "If you are done, run \"$0 clean\" to cleanup the working directory."

diff --git a/mk/main.mk b/mk/main.mk
index 815f6531a31177041c203bac574e9bde5c3071c4..cefcb832a01572441aac91b2badfb5059a67baae 100644 (file)
--- a/mk/main.mk
+++ b/mk/main.mk
@@ -1,5 +1,5 @@
 DIRNAME    := $(patsubst %-src.tar.bz2,%,$(notdir $(SRCPATH)))
-GNUTAR     ?= gnutar
+GNUTAR     ?= gtar
 HC_TARNAME ?= $(DIRNAME)-boot-$(PLATFORM).tar.bz2
 
 all: work/pack-hc-pkg.stamp