diff options
| -rw-r--r-- | strata/foundation.morph | 20 | ||||
| -rw-r--r-- | strata/foundation/coreutils.morph | 9 | ||||
| -rw-r--r-- | strata/tools/coreutils.morph | 9 |
3 files changed, 23 insertions, 15 deletions
diff --git a/strata/foundation.morph b/strata/foundation.morph index 0063b14f..dc2d94ba 100644 --- a/strata/foundation.morph +++ b/strata/foundation.morph @@ -81,6 +81,19 @@ chunks: ref: baserock/gnome build-depends: - libgpg-error +- name: patch + morph: strata/foundation/patch.morph + repo: upstream:patch + ref: 9a16dcb97aac1a26af4372d95bd62b84f3f1264a + unpetrify-ref: baserock/morph + build-depends: [] +- name: coreutils + morph: strata/foundation/coreutils.morph + repo: upstream:coreutils + ref: 9df9643842e4b4d8ece710fe6105f32fa38a0d22 + unpetrify-ref: baserock/8.23 + build-depends: + - patch - name: systemd morph: strata/foundation/systemd.morph repo: upstream:systemd @@ -88,6 +101,7 @@ chunks: unpetrify-ref: v216 build-depends: - dbus-pre + - coreutils - gobject-introspection - kmod - libcap2 @@ -134,12 +148,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/coreutils.morph b/strata/foundation/coreutils.morph new file mode 100644 index 00000000..479e9925 --- /dev/null +++ b/strata/foundation/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/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 |