From a7aea3c4d98472721d05d4cae9f453a410062cbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Wed, 15 Oct 2014 16:16:24 +0000 Subject: Move coreutils to its own stratum --- strata/coreutils-common.morph | 21 +++++++++++++++++++++ strata/coreutils-common/coreutils.morph | 9 +++++++++ strata/coreutils-common/patch.morph | 9 +++++++++ strata/foundation.morph | 6 ------ strata/foundation/patch.morph | 9 --------- strata/tools.morph | 6 ------ strata/tools/coreutils.morph | 9 --------- 7 files changed, 39 insertions(+), 30 deletions(-) create mode 100644 strata/coreutils-common.morph create mode 100644 strata/coreutils-common/coreutils.morph create mode 100644 strata/coreutils-common/patch.morph delete mode 100644 strata/foundation/patch.morph delete mode 100644 strata/tools/coreutils.morph diff --git a/strata/coreutils-common.morph b/strata/coreutils-common.morph new file mode 100644 index 00000000..c25d9509 --- /dev/null +++ b/strata/coreutils-common.morph @@ -0,0 +1,21 @@ +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: patch + morph: strata/coreutils-common/patch.morph + repo: upstream:patch + ref: 3bbb26c928a147cfcf0756f1cc0a1307e5cc663f + unpetrify-ref: baserock/v2.7.1 + build-depends: [] +- 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..820a4eed --- /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 --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 diff --git a/strata/coreutils-common/patch.morph b/strata/coreutils-common/patch.morph new file mode 100644 index 00000000..65e07e67 --- /dev/null +++ b/strata/coreutils-common/patch.morph @@ -0,0 +1,9 @@ +name: patch +kind: chunk +configure-commands: +- bash bootstrap --skip-po +- ./configure --prefix=/usr --bindir=/bin --libexecdir=/usr/sbin --disable-nls +build-commands: +- make +install-commands: +- make DESTDIR="$DESTDIR" install diff --git a/strata/foundation.morph b/strata/foundation.morph index 6d45fb1f..33866192 100644 --- a/strata/foundation.morph +++ b/strata/foundation.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/foundation/patch.morph b/strata/foundation/patch.morph deleted file mode 100644 index 65e07e67..00000000 --- a/strata/foundation/patch.morph +++ /dev/null @@ -1,9 +0,0 @@ -name: patch -kind: chunk -configure-commands: -- bash bootstrap --skip-po -- ./configure --prefix=/usr --bindir=/bin --libexecdir=/usr/sbin --disable-nls -build-commands: -- make -install-commands: -- make DESTDIR="$DESTDIR" install 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 -- cgit v1.2.1 From e31e24152b6e14833a0cccf4c8e72061df82ce4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Wed, 15 Oct 2014 16:34:08 +0000 Subject: coreutils.morph: Do not disable coreutils binaries This fixes compilation problems with several modules, like modern versions of systemd --- 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 820a4eed..479e9925 100644 --- a/strata/coreutils-common/coreutils.morph +++ b/strata/coreutils-common/coreutils.morph @@ -4,6 +4,6 @@ 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' +- FORCE_UNSAFE_CONFIGURE=1 ./configure --prefix="$PREFIX" --disable-nls install-commands: - make INSTALL_PROGRAM=install DESTDIR="$DESTDIR" install -- cgit v1.2.1 From 0b3897af32d44a44d8aa6a5751616dc22abb3072 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Wed, 15 Oct 2014 16:36:21 +0000 Subject: patch.morph: Install binaries in default location --- strata/coreutils-common/patch.morph | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/strata/coreutils-common/patch.morph b/strata/coreutils-common/patch.morph index 65e07e67..01d977c4 100644 --- a/strata/coreutils-common/patch.morph +++ b/strata/coreutils-common/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: -- cgit v1.2.1 From 516e8e466d8a0f672b0bfbc7c6e853868bc9dacf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Wed, 15 Oct 2014 16:39:33 +0000 Subject: strata/foundation: Make it depend on coreutils-common --- strata/coreutils-common.morph | 3 ++- strata/foundation.morph | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/strata/coreutils-common.morph b/strata/coreutils-common.morph index c25d9509..bbaabe42 100644 --- a/strata/coreutils-common.morph +++ b/strata/coreutils-common.morph @@ -18,4 +18,5 @@ chunks: repo: upstream:coreutils ref: 9df9643842e4b4d8ece710fe6105f32fa38a0d22 unpetrify-ref: baserock/8.23 - build-depends: [] + build-depends: + - patch diff --git a/strata/foundation.morph b/strata/foundation.morph index 33866192..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 -- cgit v1.2.1 From d7c37a3159c949f01d802a5119fbfc575a6aff79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Mon, 27 Oct 2014 00:45:52 +0000 Subject: Move "patch" to strata/core from strata/coreutils-common --- strata/core.morph | 8 ++++++++ strata/core/patch.morph | 9 +++++++++ strata/coreutils-common.morph | 9 +-------- strata/coreutils-common/patch.morph | 9 --------- 4 files changed, 18 insertions(+), 17 deletions(-) create mode 100644 strata/core/patch.morph delete mode 100644 strata/coreutils-common/patch.morph 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/core/patch.morph b/strata/core/patch.morph new file mode 100644 index 00000000..01d977c4 --- /dev/null +++ b/strata/core/patch.morph @@ -0,0 +1,9 @@ +name: patch +kind: chunk +configure-commands: +- bash bootstrap --skip-po +- ./configure --prefix="$PREFIX" --disable-nls +build-commands: +- make +install-commands: +- make DESTDIR="$DESTDIR" install diff --git a/strata/coreutils-common.morph b/strata/coreutils-common.morph index bbaabe42..9c5c38fe 100644 --- a/strata/coreutils-common.morph +++ b/strata/coreutils-common.morph @@ -7,16 +7,9 @@ description: | build-depends: - morph: strata/core.morph chunks: -- name: patch - morph: strata/coreutils-common/patch.morph - repo: upstream:patch - ref: 3bbb26c928a147cfcf0756f1cc0a1307e5cc663f - unpetrify-ref: baserock/v2.7.1 - build-depends: [] - name: coreutils morph: strata/coreutils-common/coreutils.morph repo: upstream:coreutils ref: 9df9643842e4b4d8ece710fe6105f32fa38a0d22 unpetrify-ref: baserock/8.23 - build-depends: - - patch + build-depends: [] diff --git a/strata/coreutils-common/patch.morph b/strata/coreutils-common/patch.morph deleted file mode 100644 index 01d977c4..00000000 --- a/strata/coreutils-common/patch.morph +++ /dev/null @@ -1,9 +0,0 @@ -name: patch -kind: chunk -configure-commands: -- bash bootstrap --skip-po -- ./configure --prefix="$PREFIX" --disable-nls -build-commands: -- make -install-commands: -- make DESTDIR="$DESTDIR" install -- cgit v1.2.1