summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2016-07-24 13:09:55 (GMT)
committerJavier Jardón <jjardon@gnome.org>2016-07-24 13:16:54 (GMT)
commitecdb71d3f9d25dba351b51584d80b14621c8e253 (patch)
treecca120a5359bcb41da833007344b750e3a95fb92
parentd83ca907cd0f02bd3d8aee2cb3a876ffc469a3db (diff)
downloaddefinitions-jjardon/autotools_defaults.tar.gz
tar: update to 1.29jjardon/autotools_defaults
Change-Id: Id730ab777db6e0fd32e5aba67ac2516b04b13c93
-rw-r--r--strata/coreutils-common.morph4
-rw-r--r--strata/coreutils-common/tar.morph6
2 files changed, 4 insertions, 6 deletions
diff --git a/strata/coreutils-common.morph b/strata/coreutils-common.morph
index a7f7512..c22fcfa 100644
--- a/strata/coreutils-common.morph
+++ b/strata/coreutils-common.morph
@@ -38,8 +38,8 @@ chunks:
- name: tar
morph: strata/coreutils-common/tar.morph
repo: upstream:tar
- ref: 9a58d148c26c220cb1b163c71e7a51a2e41f6b37
- unpetrify-ref: baserock/release_1_28
+ ref: 20b55f0679d314568ec21ae6db1ea635494e292b
+ unpetrify-ref: baserock/release_1_29
build-depends:
- coreutils
submodules:
diff --git a/strata/coreutils-common/tar.morph b/strata/coreutils-common/tar.morph
index 17d6a59..c839c1b 100644
--- a/strata/coreutils-common/tar.morph
+++ b/strata/coreutils-common/tar.morph
@@ -1,16 +1,14 @@
name: tar
kind: chunk
build-system: autotools
-pre-configure-commands:
-- rm .gitmodules
-- bash bootstrap --skip-po --gnulib-srcdir="$(pwd)/gnulib" --paxutils-srcdir="$(pwd)/paxutils"
configure-commands:
+- bash bootstrap --skip-po --gnulib-srcdir="$(pwd)/gnulib"
+
# Configure flag notes:
# 1. Needed to run configure as root
# 2. Disable some warning that cause the build to fail
# 3. To use GNU tar instead the busybox one.
# This will dissappear when we merge /usr/bin and /bin
-
- |
`# [1]` env FORCE_UNSAFE_CONFIGURE=1 \
./configure --prefix="$PREFIX" \