[PATCH 0/6] [V2] Move coreutils to its own stratum

[PATCH 0/3] Split lighttpd out of...

[PATCH 0/7] Drop eglibc and use...

Javier Jardón

Monday, 27 October 2014 Mon, 27 Oct '14

2:51 a.m.

REPO: ssh://git@git.baserock.org/baserock/baserock/definitions.git BRANCH: baserock/jjardon/coreutils COMMIT: 0cf1dc4a9d4ee0978049dfed4f1a7c525ea2a44b In this second series Ive moved "patch" to core so we do not have to modify every single system to not break the upgrade mechanism (ssh-rsync extension) Javier Jardón (6): Move coreutils to its own stratum strata/coreiutils-common.morph: Update to latest patch version (2.7.1) coreutils.morph: Do not disable coreutils binaries patch.morph: Install binaries in default location strata/foundation: Make it depend on coreutils-common Move "patch" to strata/core from strata/coreutils-common strata/core.morph | 8 ++++++++ strata/core/patch.morph | 9 +++++++++ strata/coreutils-common.morph | 15 +++++++++++++++ strata/coreutils-common/coreutils.morph | 9 +++++++++ strata/foundation.morph | 8 +------- strata/foundation/patch.morph | 9 --------- strata/tools.morph | 6 ------ strata/tools/coreutils.morph | 9 --------- 8 files changed, 42 insertions(+), 31 deletions(-) create mode 100644 strata/core/patch.morph create mode 100644 strata/coreutils-common.morph create mode 100644 strata/coreutils-common/coreutils.morph delete mode 100644 strata/foundation/patch.morph delete mode 100644 strata/tools/coreutils.morph -- 2.1.2

Show replies by date

Javier Jardón

Monday, 27 October Mon, 27 Oct

2:51 a.m.

New subject: [PATCH 1/6] 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 0000000..a920498 --- /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: 9a16dcb97aac1a26af4372d95bd62b84f3f1264a + unpetrify-ref: baserock/morph + 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 0000000..820a4ee --- /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 0000000..65e07e6 --- /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 f321eb8..092449b 100644 --- a/strata/foundation.morph +++ b/strata/foundation.morph @@ -123,12 +123,6 @@ chunks: unpetrify-ref: baserock/morph build-depends: - groff -- name: patch - morph: strata/foundation/patch.morph - repo: upstream:patch - ref: 9a16dcb97aac1a26af4372d95bd62b84f3f1264a - unpetrify-ref: baserock/morph - 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 65e07e6..0000000 --- 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 333b173..a09c24f 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 820a4ee..0000000 --- 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 -- 2.1.2

Emmet Hikory

7:45 a.m.

New subject: [PATCH 1/6] Move coreutils to its own stratum

On Mon, Oct 27, 2014 at 01:51:16AM +0000, Javier Jardón wrote:

...

<...> I'd prefer to see this sort of message in the commit log, rather than as a description for the stratum: it helps me understand why this is being split, but I don't expect it to help me understand why it is standalone later. -- Emmet HIKORY

Javier Jardón

2:51 a.m.

New subject: [PATCH 2/6] strata/coreiutils-common.morph: Update to latest patch version (2.7.1)

--- strata/coreutils-common.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/coreutils-common.morph b/strata/coreutils-common.morph index a920498..c25d950 100644 --- a/strata/coreutils-common.morph +++ b/strata/coreutils-common.morph @@ -10,8 +10,8 @@ chunks: - name: patch morph: strata/coreutils-common/patch.morph repo: upstream:patch - ref: 9a16dcb97aac1a26af4372d95bd62b84f3f1264a - unpetrify-ref: baserock/morph + ref: 3bbb26c928a147cfcf0756f1cc0a1307e5cc663f + unpetrify-ref: baserock/v2.7.1 build-depends: [] - name: coreutils morph: strata/coreutils-common/coreutils.morph -- 2.1.2

Javier Jardón

2:51 a.m.

New subject: [PATCH 3/6] 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 820a4ee..479e992 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 -- 2.1.2

Javier Jardón

2:51 a.m.

New subject: [PATCH 4/6] 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 65e07e6..01d977c 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: -- 2.1.2

Javier Jardón

2:51 a.m.

New subject: [PATCH 5/6] 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 c25d950..bbaabe4 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 092449b..db03de9 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 -- 2.1.2

Javier Jardón

2:51 a.m.

New subject: [PATCH 6/6] 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 5c90c96..f67e43c 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 0000000..01d977c --- /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 bbaabe4..9c5c38f 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 01d977c..0000000 --- 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 -- 2.1.2

Sam Thursfield

10:54 a.m.

On 27/10/14 01:51, Javier Jardón wrote:

...

Nice, thanks for reworking this. I think GNU Patch should live in foundation, rather than core. The description of 'core' is: "Core components of a Baserock base system that are build tools required for the BSP and Foundation strata, but a step above build-essential" The description of 'foundation' is: 'Basic userland runtime system' GNU Patch is required at runtime for Baserock systems, but not at build time, so it belongs in 'foundation'. +1 for this if you can change that (I'd be OK with it being done at merge time) -- Sam Thursfield, Codethink Ltd. Office telephone: +44 161 236 5575

Sam Thursfield

11:39 a.m.

On 27/10/14 09:54, Sam Thursfield wrote:

...

On 27/10/14 01:51, Javier Jardón wrote: > REPO: ssh://git@git.baserock.org/baserock/baserock/definitions.git > BRANCH: baserock/jjardon/coreutils > COMMIT: 0cf1dc4a9d4ee0978049dfed4f1a7c525ea2a44b > > In this second series Ive moved "patch" to core so we do not have to > modify > every single system to not break the upgrade mechanism (ssh-rsync > extension) > > Javier Jardón (6): > Move coreutils to its own stratum > strata/coreiutils-common.morph: Update to latest patch version (2.7.1) > coreutils.morph: Do not disable coreutils binaries > patch.morph: Install binaries in default location > strata/foundation: Make it depend on coreutils-common > Move "patch" to strata/core from strata/coreutils-common Nice, thanks for reworking this. I think GNU Patch should live in foundation, rather than core. The description of 'core' is: "Core components of a Baserock base system that are build tools required for the BSP and Foundation strata, but a step above build-essential" The description of 'foundation' is: 'Basic userland runtime system' GNU Patch is required at runtime for Baserock systems, but not at build time, so it belongs in 'foundation'. +1 for this if you can change that (I'd be OK with it being done at merge time)

Having tried this, it's not so simple to put GNU Patch in foundation -- GNU Bash depends on it to build. So I'm fine with GNU Patch being in core. -- Sam Thursfield, Codethink Ltd. Office telephone: +44 161 236 5575

Sam Thursfield

2:01 p.m.

On 27/10/14 09:54, Sam Thursfield wrote:

...

Apologies for sending lots of replies to my own mails. I tried to build this in an x86_64 chroot and I get a build failure from tcp_wrappers: 2014-10-27 12:48:06 Building baserock:baserock/definitions 0cf1dc4a9d4ee0978049dfed4f1a7c525ea2a44b systems/build-system-x86_64.morph 2014-10-27 12:48:06 Deciding on task order 2014-10-27 12:48:30 [Build 132/154] [tcp-wrappers] Building chunk tcp-wrappers 2014-10-27 12:48:30 [Build 132/154] [tcp-wrappers] Creating staging area 2014-10-27 12:48:34 [Build 132/154] [tcp-wrappers] Starting actual build: tcp-wrappers 23b65f2 2014-10-27 12:48:34 [Build 132/154] [tcp-wrappers] Extracting upstream:tcp-wrappers into /src/tmp/staging/tmpaQ_TSQ/tcp-wrappers.build 2014-10-27 12:48:34 [Build 132/154] [tcp-wrappers] Running build-commands 2014-10-27 12:48:36 [Build 132/154] [tcp-wrappers] Running install-commands install failed # build [snip - success] # install # # mkdir -p "$DESTDIR"/"$PREFIX"/include # # install -p -m644 tcpd.h "$DESTDIR"/"$PREFIX"/include # # mkdir -p "$DESTDIR"/"$PREFIX"/lib # # cp -a libwrap.so* "$DESTDIR"/"$PREFIX"/lib cp: preserving times for '/tcp-wrappers.inst//usr/lib/libwrap.so': No such file or directory cp: preserving times for '/tcp-wrappers.inst//usr/lib/libwrap.so.0': No such file or directory ERROR: In staging area /src/tmp/staging/tmpaQ_TSQ: running command 'sh -c cp -a libwrap.so* "$DESTDIR"/"$PREFIX"/lib' failed. The tcp_wrappers chunk lives in the 'nfs' stratum, which is not in devel-systems but is in the build-systems (distbuild uses NFS for sharing the ccache store) I think this must be due to a difference in behaviour between Busybox 'cp' and GNU 'cp'. Sam -- Sam Thursfield, Codethink Ltd. Office telephone: +44 161 236 5575

Javier Jardón

Thursday, 6 November Thu, 6 Nov

11:21 p.m.

On 27 October 2014 13:01, Sam Thursfield <sam.thursfield(a)codethink.co.uk> wrote:

...

On 27/10/14 09:54, Sam Thursfield wrote: > > On 27/10/14 01:51, Javier Jardón wrote: >> >> REPO: ssh://git@git.baserock.org/baserock/baserock/definitions.git >> BRANCH: baserock/jjardon/coreutils >> COMMIT: 0cf1dc4a9d4ee0978049dfed4f1a7c525ea2a44b >> >> In this second series Ive moved "patch" to core so we do not have to >> modify >> every single system to not break the upgrade mechanism (ssh-rsync >> extension) >> >> Javier Jardón (6): >> Move coreutils to its own stratum >> strata/coreiutils-common.morph: Update to latest patch version (2.7.1) >> coreutils.morph: Do not disable coreutils binaries >> patch.morph: Install binaries in default location >> strata/foundation: Make it depend on coreutils-common >> Move "patch" to strata/core from strata/coreutils-common > > > > Nice, thanks for reworking this. > > I think GNU Patch should live in foundation, rather than core. > > The description of 'core' is: "Core components of a Baserock base system > that are build tools required for the BSP and Foundation strata, but a > step above build-essential" > > The description of 'foundation' is: 'Basic userland runtime system' > > GNU Patch is required at runtime for Baserock systems, but not at build > time, so it belongs in 'foundation'. > > +1 for this if you can change that (I'd be OK with it being done at > merge time) Apologies for sending lots of replies to my own mails. I tried to build this in an x86_64 chroot and I get a build failure from tcp_wrappers: 2014-10-27 12:48:06 Building baserock:baserock/definitions 0cf1dc4a9d4ee0978049dfed4f1a7c525ea2a44b systems/build-system-x86_64.morph 2014-10-27 12:48:06 Deciding on task order 2014-10-27 12:48:30 [Build 132/154] [tcp-wrappers] Building chunk tcp-wrappers 2014-10-27 12:48:30 [Build 132/154] [tcp-wrappers] Creating staging area 2014-10-27 12:48:34 [Build 132/154] [tcp-wrappers] Starting actual build: tcp-wrappers 23b65f2 2014-10-27 12:48:34 [Build 132/154] [tcp-wrappers] Extracting upstream:tcp-wrappers into /src/tmp/staging/tmpaQ_TSQ/tcp-wrappers.build 2014-10-27 12:48:34 [Build 132/154] [tcp-wrappers] Running build-commands 2014-10-27 12:48:36 [Build 132/154] [tcp-wrappers] Running install-commands install failed # build [snip - success] # install # # mkdir -p "$DESTDIR"/"$PREFIX"/include # # install -p -m644 tcpd.h "$DESTDIR"/"$PREFIX"/include # # mkdir -p "$DESTDIR"/"$PREFIX"/lib # # cp -a libwrap.so* "$DESTDIR"/"$PREFIX"/lib cp: preserving times for '/tcp-wrappers.inst//usr/lib/libwrap.so': No such file or directory cp: preserving times for '/tcp-wrappers.inst//usr/lib/libwrap.so.0': No such file or directory ERROR: In staging area /src/tmp/staging/tmpaQ_TSQ: running command 'sh -c cp -a libwrap.so* "$DESTDIR"/"$PREFIX"/lib' failed. The tcp_wrappers chunk lives in the 'nfs' stratum, which is not in devel-systems but is in the build-systems (distbuild uses NFS for sharing the ccache store) I think this must be due to a difference in behaviour between Busybox 'cp' and GNU 'cp'.

Hey Sam! We are not building tcpwrappers anymore, do you think this can be merged now? Regards, -- Javier Jardón Cabezas

Sam Thursfield

Friday, 7 November Fri, 7 Nov

6:07 p.m.

On 06/11/14 22:21, Javier Jardón wrote:

...

On 27 October 2014 13:01, Sam Thursfield <sam.thursfield(a)codethink.co.uk> wrote: > On 27/10/14 09:54, Sam Thursfield wrote: >> >> On 27/10/14 01:51, Javier Jardón wrote: >>> >>> REPO: ssh://git@git.baserock.org/baserock/baserock/definitions.git >>> BRANCH: baserock/jjardon/coreutils >>> COMMIT: 0cf1dc4a9d4ee0978049dfed4f1a7c525ea2a44b >>> >>> In this second series Ive moved "patch" to core so we do not have to >>> modify >>> every single system to not break the upgrade mechanism (ssh-rsync >>> extension) >>> >>> Javier Jardón (6): >>> Move coreutils to its own stratum >>> strata/coreiutils-common.morph: Update to latest patch version (2.7.1) >>> coreutils.morph: Do not disable coreutils binaries >>> patch.morph: Install binaries in default location >>> strata/foundation: Make it depend on coreutils-common >>> Move "patch" to strata/core from strata/coreutils-common >> >> >> >> Nice, thanks for reworking this. >> >> I think GNU Patch should live in foundation, rather than core. >> >> The description of 'core' is: "Core components of a Baserock base system >> that are build tools required for the BSP and Foundation strata, but a >> step above build-essential" >> >> The description of 'foundation' is: 'Basic userland runtime system' >> >> GNU Patch is required at runtime for Baserock systems, but not at build >> time, so it belongs in 'foundation'. >> >> +1 for this if you can change that (I'd be OK with it being done at >> merge time) > > > Apologies for sending lots of replies to my own mails. I tried to build this > in an x86_64 chroot and I get a build failure from tcp_wrappers: > > 2014-10-27 12:48:06 Building baserock:baserock/definitions > 0cf1dc4a9d4ee0978049dfed4f1a7c525ea2a44b systems/build-system-x86_64.morph > 2014-10-27 12:48:06 Deciding on task order > 2014-10-27 12:48:30 [Build 132/154] [tcp-wrappers] Building chunk > tcp-wrappers > 2014-10-27 12:48:30 [Build 132/154] [tcp-wrappers] Creating staging area > 2014-10-27 12:48:34 [Build 132/154] [tcp-wrappers] Starting actual build: > tcp-wrappers 23b65f2 > 2014-10-27 12:48:34 [Build 132/154] [tcp-wrappers] Extracting > upstream:tcp-wrappers into /src/tmp/staging/tmpaQ_TSQ/tcp-wrappers.build > 2014-10-27 12:48:34 [Build 132/154] [tcp-wrappers] Running build-commands > 2014-10-27 12:48:36 [Build 132/154] [tcp-wrappers] Running install-commands > install failed > # build > [snip - success] > # install > # # mkdir -p "$DESTDIR"/"$PREFIX"/include > # # install -p -m644 tcpd.h "$DESTDIR"/"$PREFIX"/include > # # mkdir -p "$DESTDIR"/"$PREFIX"/lib > # # cp -a libwrap.so* "$DESTDIR"/"$PREFIX"/lib > cp: preserving times for '/tcp-wrappers.inst//usr/lib/libwrap.so': No such > file or directory > cp: preserving times for '/tcp-wrappers.inst//usr/lib/libwrap.so.0': No such > file or directory > ERROR: In staging area /src/tmp/staging/tmpaQ_TSQ: running command 'sh -c cp > -a libwrap.so* "$DESTDIR"/"$PREFIX"/lib' failed. > > The tcp_wrappers chunk lives in the 'nfs' stratum, which is not in > devel-systems but is in the build-systems (distbuild uses NFS for sharing > the ccache store) > > I think this must be due to a difference in behaviour between Busybox 'cp' > and GNU 'cp'. Hey Sam! We are not building tcpwrappers anymore, do you think this can be merged now?

OK, +1 to merge this -- Sam Thursfield, Codethink Ltd. Office telephone: +44 161 236 5575

Paul Sherwood

Tuesday, 11 November Tue, 11 Nov

6:33 p.m.

On 2014-11-06 22:21, Javier Jardón wrote:

...

Hey Sam! We are not building tcpwrappers anymore, do you think this can be merged now?

I built and booted this successfully, so +1 from me. And richard_maw has +1 on irc Sam has already given +1 so it should be mergeable now?

Javier Jardón

Wednesday, 12 November Wed, 12 Nov

12:19 a.m.

On 11 November 2014 17:33, Paul Sherwood <paul.sherwood(a)codethink.co.uk> wrote:

...

On 2014-11-06 22:21, Javier Jardón wrote: > > > Hey Sam! > > We are not building tcpwrappers anymore, do you think this can be merged > now? I built and booted this successfully, so +1 from me. And richard_maw has +1 on irc Sam has already given +1 so it should be mergeable now?

This has been merged! Thanks all for the reviews! -- Javier Jardón Cabezas

3314

days inactive

3329

days old

baserock-dev@baserock.org

Manage subscription

14 comments

4 participants

tags (0)

participants (4)

Emmet Hikory
Javier Jardón
Paul Sherwood
Sam Thursfield

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

[PATCH 0/6] [V2] Move coreutils to its own stratum