From ced9d46974b3e36e6a87a6a44000e61f67bead47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Wed, 18 Feb 2015 16:41:57 +0000 Subject: strata/core/bison: Use default autotools commands instead hardcode them --- strata/core/bison.morph | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/strata/core/bison.morph b/strata/core/bison.morph index a9497d4e..0c649e78 100644 --- a/strata/core/bison.morph +++ b/strata/core/bison.morph @@ -1,10 +1,6 @@ name: bison kind: chunk -configure-commands: +build-system: autotools +pre-configure-commands: - echo $(grep '* Noteworthy changes in release' NEWS | grep -v '?\\.?' | head -n1 | cut -d' ' -f6) > .tarball-version - bash bootstrap --skip-po -- ./configure --prefix=/usr --disable-nls -build-commands: -- make -install-commands: -- make DESTDIR="$DESTDIR" install -- cgit v1.2.1 From b09dc25ecfc6685a8b0c9337f228b6fe44bd00c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Wed, 25 Feb 2015 14:51:24 +0000 Subject: Update gstreamer to include fix to detect bison version correcly --- strata/multimedia-gstreamer.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/multimedia-gstreamer.morph b/strata/multimedia-gstreamer.morph index cee7df71..2df8a0ce 100644 --- a/strata/multimedia-gstreamer.morph +++ b/strata/multimedia-gstreamer.morph @@ -13,8 +13,8 @@ chunks: build-depends: [] - name: gstreamer repo: upstream:gstreamer - ref: b9b3440e323c7b32a8c3a9d52c7bf1a229850558 - unpetrify-ref: baserock/1.4 + ref: c61dea148ca3f14586d8eddf0b7e6ca47c164c86 + unpetrify-ref: baserock/1.4.4+bison_fix build-depends: - orc - name: gstreamer-plugins-base -- cgit v1.2.1 From e83d0a9565a99d5f7885f7b28ce21cca57e343d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Wed, 18 Feb 2015 19:03:30 +0000 Subject: strata/core/bison: Do not use workaround to get package version --- strata/core/bison.morph | 1 - 1 file changed, 1 deletion(-) diff --git a/strata/core/bison.morph b/strata/core/bison.morph index 0c649e78..7c7fffd9 100644 --- a/strata/core/bison.morph +++ b/strata/core/bison.morph @@ -2,5 +2,4 @@ name: bison kind: chunk build-system: autotools pre-configure-commands: -- echo $(grep '* Noteworthy changes in release' NEWS | grep -v '?\\.?' | head -n1 | cut -d' ' -f6) > .tarball-version - bash bootstrap --skip-po -- cgit v1.2.1 From c5240343053398d288cc500ff54379a3b0de5309 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Wed, 18 Feb 2015 19:21:10 +0000 Subject: strata/core.morph: bison doesnt depend on bash --- strata/core.morph | 1 - strata/core/bison.morph | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/strata/core.morph b/strata/core.morph index a5ec5204..4a33d86d 100644 --- a/strata/core.morph +++ b/strata/core.morph @@ -212,7 +212,6 @@ chunks: build-depends: - autoconf-tarball - automake - - bash - flex - gettext-tarball - git diff --git a/strata/core/bison.morph b/strata/core/bison.morph index 7c7fffd9..5f50fe89 100644 --- a/strata/core/bison.morph +++ b/strata/core/bison.morph @@ -2,4 +2,4 @@ name: bison kind: chunk build-system: autotools pre-configure-commands: -- bash bootstrap --skip-po +- ./bootstrap --skip-po -- cgit v1.2.1 From 8be8eeed482a2fe7836973d4c4e3ae0babeb18dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Wed, 18 Feb 2015 17:40:13 +0000 Subject: strata/coreutils-common/coreutils: Tell coreutils to not use git --- strata/coreutils-common/coreutils.morph | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/strata/coreutils-common/coreutils.morph b/strata/coreutils-common/coreutils.morph index cc1ae683..19542d79 100644 --- a/strata/coreutils-common/coreutils.morph +++ b/strata/coreutils-common/coreutils.morph @@ -3,7 +3,7 @@ kind: chunk build-system: autotools configure-commands: - sed -i -e '/^buildreq="/,/^"/{/rsync/d}' bootstrap.conf -- bash bootstrap --skip-po +- bash bootstrap --skip-po --no-git --gnulib-srcdir=gnulib - FORCE_UNSAFE_CONFIGURE=1 ./configure --prefix="$PREFIX" --disable-nls build-commands: - make WERROR_CFLAGS= -- cgit v1.2.1 From 0d70f2a93c1c8e9c0fe94c13b522126b2898c84e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Wed, 18 Feb 2015 19:07:31 +0000 Subject: strata/core: gtk-doc-stub doesnt depend on automake/autoconf/libtool ... but in a bash configure script --- strata/core.morph | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/strata/core.morph b/strata/core.morph index 4a33d86d..04b32e2b 100644 --- a/strata/core.morph +++ b/strata/core.morph @@ -128,9 +128,7 @@ chunks: ref: 58ec0d8593541ef7ae522ce42ebec6f98536c4e0 unpetrify-ref: baserock/morph build-depends: - - autoconf-tarball - - automake - - libtool-tarball + - bash - name: xz repo: upstream:xz ref: a0cd05ee71d330b79ead6eb9222e1b24e1559d3a -- cgit v1.2.1 From 3c1861c9e2a5a54aa0ab289189ec291e1c22398b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Wed, 18 Feb 2015 19:09:20 +0000 Subject: strata/core: Upgrade to latest version of help2man (1.46.5) --- strata/core.morph | 5 ++--- strata/core/help2man.morph | 9 --------- 2 files changed, 2 insertions(+), 12 deletions(-) delete mode 100644 strata/core/help2man.morph diff --git a/strata/core.morph b/strata/core.morph index 04b32e2b..0dc3f150 100644 --- a/strata/core.morph +++ b/strata/core.morph @@ -195,10 +195,9 @@ chunks: - libexpat - openssl-new - name: help2man - morph: strata/core/help2man.morph repo: upstream:help2man - ref: 0191a5f61525f8deea2ae8bdfea88190d85b6a71 - unpetrify-ref: baserock/morph + ref: 83bab7e2e8e24a380266a9a247c029c49b0de666 + unpetrify-ref: baserock/v1.46.5 build-depends: - autoconf-tarball - automake diff --git a/strata/core/help2man.morph b/strata/core/help2man.morph deleted file mode 100644 index e25a8d8e..00000000 --- a/strata/core/help2man.morph +++ /dev/null @@ -1,9 +0,0 @@ -name: help2man -kind: chunk -configure-commands: -- autoreconf -i -- ./configure --prefix=/usr -build-commands: -- make -install-commands: -- make DESTDIR="$DESTDIR" install -- cgit v1.2.1 From 70357b67fabfdee12d4396296f145809fbc7b933 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Wed, 18 Feb 2015 19:18:30 +0000 Subject: strata/core.morph: libtool doesnt depend on bash --- strata/core.morph | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/strata/core.morph b/strata/core.morph index 0dc3f150..336a65dc 100644 --- a/strata/core.morph +++ b/strata/core.morph @@ -121,8 +121,7 @@ chunks: repo: upstream:libtool-tarball ref: c026ca36e37d2643623a75d0d3e9e451023139f3 unpetrify-ref: libtool-2.4.6 - build-depends: - - bash + build-depends: [] - name: gtk-doc-stub repo: upstream:gtk-doc-stub ref: 58ec0d8593541ef7ae522ce42ebec6f98536c4e0 -- cgit v1.2.1 From d1c392c5f176d578ee02b2b54d0bda6a1ff37794 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Wed, 18 Feb 2015 20:22:26 +0000 Subject: strata/core: patch doesnt depend on bash --- strata/core.morph | 1 - strata/core/patch.morph | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/strata/core.morph b/strata/core.morph index 336a65dc..5de96bd4 100644 --- a/strata/core.morph +++ b/strata/core.morph @@ -282,5 +282,4 @@ chunks: ref: 3bbb26c928a147cfcf0756f1cc0a1307e5cc663f unpetrify-ref: baserock/v2.7.1 build-depends: - - bash - shadow diff --git a/strata/core/patch.morph b/strata/core/patch.morph index 01d977c4..8e8f309c 100644 --- a/strata/core/patch.morph +++ b/strata/core/patch.morph @@ -1,7 +1,7 @@ name: patch kind: chunk configure-commands: -- bash bootstrap --skip-po +- ./bootstrap --skip-po - ./configure --prefix="$PREFIX" --disable-nls build-commands: - make -- cgit v1.2.1 From c301e719a8d787341bea26e1ac6401b691b6570c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Thu, 19 Feb 2015 12:46:15 +0000 Subject: strata/core/patch: Use default autotools commands instead hardcode them --- strata/core/patch.morph | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/strata/core/patch.morph b/strata/core/patch.morph index 8e8f309c..b7f146ef 100644 --- a/strata/core/patch.morph +++ b/strata/core/patch.morph @@ -1,9 +1,5 @@ name: patch kind: chunk -configure-commands: +build-system: autotools +pre-configure-commands: - ./bootstrap --skip-po -- ./configure --prefix="$PREFIX" --disable-nls -build-commands: -- make -install-commands: -- make DESTDIR="$DESTDIR" install -- cgit v1.2.1 From 663e1f7dcec49ca6f6d53d69033ce3bd1ed483e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Thu, 19 Feb 2015 12:59:23 +0000 Subject: Move libopt morph file to correct location (chef stratum) --- strata/chef.morph | 2 +- strata/chef/libpopt.morph | 10 ++++++++++ strata/core/libpopt.morph | 10 ---------- 3 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 strata/chef/libpopt.morph delete mode 100644 strata/core/libpopt.morph diff --git a/strata/chef.morph b/strata/chef.morph index cd969cda..059f8a6a 100644 --- a/strata/chef.morph +++ b/strata/chef.morph @@ -202,7 +202,7 @@ chunks: unpetrify-ref: 1.0.0 build-depends: [] - name: libpopt - morph: strata/core/libpopt.morph + morph: strata/chef/libpopt.morph repo: upstream:libpopt ref: c224abf28f4ff9bbf292908324359cb5905addf8 unpetrify-ref: master diff --git a/strata/chef/libpopt.morph b/strata/chef/libpopt.morph new file mode 100644 index 00000000..ae27432c --- /dev/null +++ b/strata/chef/libpopt.morph @@ -0,0 +1,10 @@ +name: libpopt +kind: chunk +configure-commands: +- autoreconf -if +- ./configure +build-commands: +- make +install-commands: +- make DESTDIR="$DESTDIR" install + diff --git a/strata/core/libpopt.morph b/strata/core/libpopt.morph deleted file mode 100644 index ae27432c..00000000 --- a/strata/core/libpopt.morph +++ /dev/null @@ -1,10 +0,0 @@ -name: libpopt -kind: chunk -configure-commands: -- autoreconf -if -- ./configure -build-commands: -- make -install-commands: -- make DESTDIR="$DESTDIR" install - -- cgit v1.2.1 From 161d70eaa1202e0bda150f21e3d537cc23480772 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Thu, 26 Feb 2015 11:48:03 +0000 Subject: strata/chef/libpopt: Use default autotools commands instead hardcode them --- strata/chef/libpopt.morph | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/strata/chef/libpopt.morph b/strata/chef/libpopt.morph index ae27432c..6adde30c 100644 --- a/strata/chef/libpopt.morph +++ b/strata/chef/libpopt.morph @@ -1,10 +1,6 @@ name: libpopt kind: chunk +build-system: autotools configure-commands: - autoreconf -if - ./configure -build-commands: -- make -install-commands: -- make DESTDIR="$DESTDIR" install - -- cgit v1.2.1 From 28c0cb385380ae3f956813068c741ab3e54f0ef2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Thu, 19 Feb 2015 13:00:38 +0000 Subject: Move sgdisk morph file to correct location (chef stratum) --- strata/chef.morph | 2 +- strata/chef/sgdisk.morph | 7 +++++++ strata/core/sgdisk.morph | 7 ------- 3 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 strata/chef/sgdisk.morph delete mode 100644 strata/core/sgdisk.morph diff --git a/strata/chef.morph b/strata/chef.morph index 059f8a6a..9105a2e0 100644 --- a/strata/chef.morph +++ b/strata/chef.morph @@ -208,7 +208,7 @@ chunks: unpetrify-ref: master build-depends: [] - name: sgdisk - morph: strata/core/sgdisk.morph + morph: strata/chef/sgdisk.morph repo: upstream:sgdisk ref: a920398fa393f9d6301b32b191bc01e086ab8bc8 unpetrify-ref: master diff --git a/strata/chef/sgdisk.morph b/strata/chef/sgdisk.morph new file mode 100644 index 00000000..e792f9d9 --- /dev/null +++ b/strata/chef/sgdisk.morph @@ -0,0 +1,7 @@ +name: sgdisk +kind: chunk +build-commands: +- make +install-commands: +- install -D -m 0755 -o root -g root sgdisk "$DESTDIR$PREFIX/bin/sgdisk" + diff --git a/strata/core/sgdisk.morph b/strata/core/sgdisk.morph deleted file mode 100644 index e792f9d9..00000000 --- a/strata/core/sgdisk.morph +++ /dev/null @@ -1,7 +0,0 @@ -name: sgdisk -kind: chunk -build-commands: -- make -install-commands: -- install -D -m 0755 -o root -g root sgdisk "$DESTDIR$PREFIX/bin/sgdisk" - -- cgit v1.2.1