summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2014-11-11 22:51:15 +0000
committerJavier Jardón <jjardon@gnome.org>2014-11-11 22:52:15 +0000
commitc42e94f0a7dddf3df2dd14d6fb3283b81ee62d5d (patch)
treef2196f498c3e772bb5cbb268a60691f572077b82
parent312e07068a496879e867eabf7ad11041b7779f80 (diff)
parentd7c37a3159c949f01d802a5119fbfc575a6aff79 (diff)
downloaddefinitions-c42e94f0a7dddf3df2dd14d6fb3283b81ee62d5d.tar.gz
Merge branch 'baserock/jjardon/coreutils'
Reviewed-By: Sam Thursfield <sam.thursfield@codethink.co.uk> Reviewed-By: Paul Sherwood <paul.sherwood@codethink.co.uk> Reviewed-By: Richard Maw <richard.maw@codethink.co.uk>
-rw-r--r--strata/core.morph8
-rw-r--r--strata/core/patch.morph (renamed from strata/foundation/patch.morph)2
-rw-r--r--strata/coreutils-common.morph15
-rw-r--r--strata/coreutils-common/coreutils.morph9
-rw-r--r--strata/foundation.morph8
-rw-r--r--strata/tools.morph6
-rw-r--r--strata/tools/coreutils.morph9
7 files changed, 34 insertions, 23 deletions
diff --git a/strata/core.morph b/strata/core.morph
index 96731777..6f66adbc 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -302,3 +302,11 @@ chunks:
- gettext
- libtool
- bison
+- name: patch
+ morph: strata/core/patch.morph
+ repo: upstream:patch
+ ref: 3bbb26c928a147cfcf0756f1cc0a1307e5cc663f
+ unpetrify-ref: baserock/v2.7.1
+ build-depends:
+ - bash
+ - shadow
diff --git a/strata/foundation/patch.morph b/strata/core/patch.morph
index 65e07e67..01d977c4 100644
--- a/strata/foundation/patch.morph
+++ b/strata/core/patch.morph
@@ -2,7 +2,7 @@ name: patch
kind: chunk
configure-commands:
- bash bootstrap --skip-po
-- ./configure --prefix=/usr --bindir=/bin --libexecdir=/usr/sbin --disable-nls
+- ./configure --prefix="$PREFIX" --disable-nls
build-commands:
- make
install-commands:
diff --git a/strata/coreutils-common.morph b/strata/coreutils-common.morph
new file mode 100644
index 00000000..9c5c38fe
--- /dev/null
+++ b/strata/coreutils-common.morph
@@ -0,0 +1,15 @@
+name: coreutils-common
+kind: stratum
+description: |
+ We need to split this so we can build stuff using coreutils but we can not
+ having it in the final systems (for example in genivi ones that do not
+ accept GPLv3 code)
+build-depends:
+- morph: strata/core.morph
+chunks:
+- name: coreutils
+ morph: strata/coreutils-common/coreutils.morph
+ repo: upstream:coreutils
+ ref: 9df9643842e4b4d8ece710fe6105f32fa38a0d22
+ unpetrify-ref: baserock/8.23
+ build-depends: []
diff --git a/strata/coreutils-common/coreutils.morph b/strata/coreutils-common/coreutils.morph
new file mode 100644
index 00000000..479e9925
--- /dev/null
+++ b/strata/coreutils-common/coreutils.morph
@@ -0,0 +1,9 @@
+name: coreutils
+kind: chunk
+build-system: autotools
+configure-commands:
+- sed -i -e '/^buildreq="/,/^"/{/rsync/d}' bootstrap.conf
+- bash bootstrap --skip-po
+- FORCE_UNSAFE_CONFIGURE=1 ./configure --prefix="$PREFIX" --disable-nls
+install-commands:
+- make INSTALL_PROGRAM=install DESTDIR="$DESTDIR" install
diff --git a/strata/foundation.morph b/strata/foundation.morph
index 6d45fb1f..a652fbd6 100644
--- a/strata/foundation.morph
+++ b/strata/foundation.morph
@@ -2,7 +2,7 @@ name: foundation
kind: stratum
description: Basic userland runtime system
build-depends:
-- morph: strata/core.morph
+- morph: strata/coreutils-common.morph
chunks:
- name: attr
morph: strata/foundation/attr.morph
@@ -121,12 +121,6 @@ chunks:
unpetrify-ref: baserock/morph
build-depends:
- groff
-- name: patch
- morph: strata/foundation/patch.morph
- repo: upstream:patch
- ref: 3bbb26c928a147cfcf0756f1cc0a1307e5cc663f
- unpetrify-ref: baserock/v2.7.1
- build-depends: []
- name: tbdiff
morph: strata/foundation/tbdiff.morph
repo: baserock:baserock/tbdiff
diff --git a/strata/tools.morph b/strata/tools.morph
index 333b173f..a09c24f5 100644
--- a/strata/tools.morph
+++ b/strata/tools.morph
@@ -4,12 +4,6 @@ description: Extra development tools included in the devel system
build-depends:
- morph: strata/foundation.morph
chunks:
-- name: coreutils
- morph: strata/tools/coreutils.morph
- repo: upstream:coreutils
- ref: 9df9643842e4b4d8ece710fe6105f32fa38a0d22
- unpetrify-ref: baserock/8.23
- build-depends: []
- name: distcc
morph: strata/tools/distcc.morph
repo: upstream:distcc
diff --git a/strata/tools/coreutils.morph b/strata/tools/coreutils.morph
deleted file mode 100644
index 820a4eed..00000000
--- a/strata/tools/coreutils.morph
+++ /dev/null
@@ -1,9 +0,0 @@
-name: coreutils
-kind: chunk
-build-system: autotools
-configure-commands:
-- sed -i -e '/^buildreq="/,/^"/{/rsync/d}' bootstrap.conf
-- bash bootstrap --skip-po
-- FORCE_UNSAFE_CONFIGURE=1 ./configure --prefix="$PREFIX" --disable-nls --enable-no-install-program='[,base64,basename,cat,chcon,chgrp,chmod,chown,chroot,cksum,comm,cp,csplit,cut,date,dd,df,dir,dircolors,dirname,du,echo,env,expand,expr,false,fold,ginstall,groups,head,hostid,id,kill,ln,logname,ls,md5sum,mkdir,mkfifo,mknod,mktemp,mv,nice,nohup,od,printenv,printf,pwd,readlink,realpath,rm,rmdir,seq,sha1sum,sha224sum,sha256sum,sha384sum,sha512sum,sleep,sort,split,stat,stty,sum,sync,tac,tail,tee,test,timeout,touch,tr,true,tty,uname,unexpand,uniq,unlink,uptime,users,wc,who,whoami,yes'
-install-commands:
-- make INSTALL_PROGRAM=install DESTDIR="$DESTDIR" install