summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2015-02-26 12:39:39 (GMT)
committerJavier Jardón <jjardon@gnome.org>2015-02-26 12:40:00 (GMT)
commit38bc8b124a2c15abde91c7c263a833459071efa5 (patch)
treefed94425874594207492bff8c1b363fc653ea29d
parenta43cfbabc13dcee38827ccab55c8de7c5c6b1137 (diff)
parent28c0cb385380ae3f956813068c741ab3e54f0ef2 (diff)
downloaddefinitions-38bc8b124a2c15abde91c7c263a833459071efa5.tar.gz
Merge branch 'baserock/jjardon/core_cleanup'
Reviewed-By: Richard Maw <richard.maw@gmail.com>
-rw-r--r--strata/chef.morph4
-rw-r--r--strata/chef/libpopt.morph (renamed from strata/core/libpopt.morph)6
-rw-r--r--strata/chef/sgdisk.morph (renamed from strata/core/sgdisk.morph)0
-rw-r--r--strata/core.morph14
-rw-r--r--strata/core/bison.morph11
-rw-r--r--strata/core/help2man.morph9
-rw-r--r--strata/core/patch.morph10
-rw-r--r--strata/coreutils-common/coreutils.morph2
-rw-r--r--strata/multimedia-gstreamer.morph4
9 files changed, 16 insertions, 44 deletions
diff --git a/strata/chef.morph b/strata/chef.morph
index cd969cd..9105a2e 100644
--- a/strata/chef.morph
+++ b/strata/chef.morph
@@ -202,13 +202,13 @@ 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
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/core/libpopt.morph b/strata/chef/libpopt.morph
index ae27432..6adde30 100644
--- a/strata/core/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
-
diff --git a/strata/core/sgdisk.morph b/strata/chef/sgdisk.morph
index e792f9d..e792f9d 100644
--- a/strata/core/sgdisk.morph
+++ b/strata/chef/sgdisk.morph
diff --git a/strata/core.morph b/strata/core.morph
index a5ec520..5de96bd 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -121,16 +121,13 @@ 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
unpetrify-ref: baserock/morph
build-depends:
- - autoconf-tarball
- - automake
- - libtool-tarball
+ - bash
- name: xz
repo: upstream:xz
ref: a0cd05ee71d330b79ead6eb9222e1b24e1559d3a
@@ -197,10 +194,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
@@ -212,7 +208,6 @@ chunks:
build-depends:
- autoconf-tarball
- automake
- - bash
- flex
- gettext-tarball
- git
@@ -287,5 +282,4 @@ chunks:
ref: 3bbb26c928a147cfcf0756f1cc0a1307e5cc663f
unpetrify-ref: baserock/v2.7.1
build-depends:
- - bash
- shadow
diff --git a/strata/core/bison.morph b/strata/core/bison.morph
index a9497d4..5f50fe8 100644
--- a/strata/core/bison.morph
+++ b/strata/core/bison.morph
@@ -1,10 +1,5 @@
name: bison
kind: chunk
-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
+build-system: autotools
+pre-configure-commands:
+- ./bootstrap --skip-po
diff --git a/strata/core/help2man.morph b/strata/core/help2man.morph
deleted file mode 100644
index e25a8d8..0000000
--- 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
diff --git a/strata/core/patch.morph b/strata/core/patch.morph
index 01d977c..b7f146e 100644
--- a/strata/core/patch.morph
+++ b/strata/core/patch.morph
@@ -1,9 +1,5 @@
name: patch
kind: chunk
-configure-commands:
-- bash bootstrap --skip-po
-- ./configure --prefix="$PREFIX" --disable-nls
-build-commands:
-- make
-install-commands:
-- make DESTDIR="$DESTDIR" install
+build-system: autotools
+pre-configure-commands:
+- ./bootstrap --skip-po
diff --git a/strata/coreutils-common/coreutils.morph b/strata/coreutils-common/coreutils.morph
index cc1ae68..19542d7 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=
diff --git a/strata/multimedia-gstreamer.morph b/strata/multimedia-gstreamer.morph
index cee7df7..2df8a0c 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