diff options
Diffstat (limited to 'strata/core')
| -rw-r--r-- | strata/core/autoconf-tarball.morph (renamed from strata/core/libtool.morph) | 3 | ||||
| -rw-r--r-- | strata/core/ca-certificates.morph | 4 | ||||
| -rw-r--r-- | strata/core/gettext-tarball.morph (renamed from strata/core/autoconf.morph) | 2 | ||||
| -rw-r--r-- | strata/core/gettext.morph | 9 | ||||
| -rw-r--r-- | strata/core/libpopt.morph | 10 | ||||
| -rw-r--r-- | strata/core/libtool-tarball.morph (renamed from strata/core/m4.morph) | 4 | ||||
| -rw-r--r-- | strata/core/pkg-config.morph | 2 | ||||
| -rw-r--r-- | strata/core/sgdisk.morph | 7 | ||||
| -rw-r--r-- | strata/core/xz.morph | 3 |
9 files changed, 26 insertions, 18 deletions
diff --git a/strata/core/libtool.morph b/strata/core/autoconf-tarball.morph index f311281d..fbdc5768 100644 --- a/strata/core/libtool.morph +++ b/strata/core/autoconf-tarball.morph @@ -1,6 +1,5 @@ -name: libtool +name: autoconf-tarball kind: chunk -max-jobs: 1 build-system: autotools configure-commands: - ./configure --prefix="$PREFIX" diff --git a/strata/core/ca-certificates.morph b/strata/core/ca-certificates.morph index 3072e4f3..b7bd9e5a 100644 --- a/strata/core/ca-certificates.morph +++ b/strata/core/ca-certificates.morph @@ -16,3 +16,7 @@ post-install-commands: export ETCCERTSDIR="$DESTDIR/etc/ssl/certs" mkdir -p "$ETCCERTSDIR" ./sbin/update-ca-certificates +system-integration: + ca-certificates-misc: + 00-update-ca-certs: + - update-ca-certificates diff --git a/strata/core/autoconf.morph b/strata/core/gettext-tarball.morph index 046bfc40..4983b484 100644 --- a/strata/core/autoconf.morph +++ b/strata/core/gettext-tarball.morph @@ -1,4 +1,4 @@ -name: autoconf +name: gettext-tarball kind: chunk build-system: autotools configure-commands: diff --git a/strata/core/gettext.morph b/strata/core/gettext.morph deleted file mode 100644 index 3e2c56b5..00000000 --- a/strata/core/gettext.morph +++ /dev/null @@ -1,9 +0,0 @@ -name: gettext -kind: chunk -max-jobs: 1 -configure-commands: -- ./configure --prefix=/usr -build-commands: -- make EXAMPLESPOFILES= -install-commands: -- make EXAMPLESPOFILES= DESTDIR="$DESTDIR" install diff --git a/strata/core/libpopt.morph b/strata/core/libpopt.morph new file mode 100644 index 00000000..ae27432c --- /dev/null +++ b/strata/core/libpopt.morph @@ -0,0 +1,10 @@ +name: libpopt +kind: chunk +configure-commands: +- autoreconf -if +- ./configure +build-commands: +- make +install-commands: +- make DESTDIR="$DESTDIR" install + diff --git a/strata/core/m4.morph b/strata/core/libtool-tarball.morph index b76afbe4..65a3edbc 100644 --- a/strata/core/m4.morph +++ b/strata/core/libtool-tarball.morph @@ -1,5 +1,5 @@ -name: m4 +name: libtool-tarball kind: chunk build-system: autotools configure-commands: -- ./configure --prefix="$PREFIX" --disable-nls +- ./configure --prefix="$PREFIX" diff --git a/strata/core/pkg-config.morph b/strata/core/pkg-config.morph index 090a65e5..ed35a2ac 100644 --- a/strata/core/pkg-config.morph +++ b/strata/core/pkg-config.morph @@ -2,4 +2,4 @@ name: pkg-config kind: chunk build-system: autotools configure-commands: -- ./configure --prefix="$PREFIX" --with-internal-glib +- ./autogen.sh --prefix="$PREFIX" --with-internal-glib diff --git a/strata/core/sgdisk.morph b/strata/core/sgdisk.morph new file mode 100644 index 00000000..e792f9d9 --- /dev/null +++ b/strata/core/sgdisk.morph @@ -0,0 +1,7 @@ +name: sgdisk +kind: chunk +build-commands: +- make +install-commands: +- install -D -m 0755 -o root -g root sgdisk "$DESTDIR$PREFIX/bin/sgdisk" + diff --git a/strata/core/xz.morph b/strata/core/xz.morph deleted file mode 100644 index 8165abdc..00000000 --- a/strata/core/xz.morph +++ /dev/null @@ -1,3 +0,0 @@ -name: xz -kind: chunk -build-system: autotools |