From 81758cbdbe9f600e1afbafe60dc359982dff3187 Mon Sep 17 00:00:00 2001 From: Richard Dale Date: Fri, 19 Jun 2015 11:59:54 +0100 Subject: Update core-wrt.morph to build with musl --- strata/core-wrt.morph | 56 +++++++++++++++++++++------------------ strata/core/attr.morph | 11 +++++++- strata/core/autopoint.morph | 13 +++++++++ strata/core/gettext-tiny.morph | 6 +++++ strata/core/shadow.morph | 50 +--------------------------------- strata/core/util-linux-musl.morph | 6 +++++ 6 files changed, 66 insertions(+), 76 deletions(-) create mode 100644 strata/core/autopoint.morph create mode 100644 strata/core/gettext-tiny.morph create mode 100644 strata/core/util-linux-musl.morph diff --git a/strata/core-wrt.morph b/strata/core-wrt.morph index 90c7cf9a..f20c7873 100644 --- a/strata/core-wrt.morph +++ b/strata/core-wrt.morph @@ -12,23 +12,31 @@ chunks: - name: cmake morph: strata/core/cmake.morph repo: upstream:cmake - ref: 732d8a467ab8a295b1bbf580f865980f8a1a9b29 - unpetrify-ref: v3.2.1 + ref: 0b3781e4c497566acaa504d4106d11c02a642501 + unpetrify-ref: v2.8.12.2 - name: gdbm morph: strata/core/gdbm.morph repo: upstream:gdbm-tarball ref: e5faeaaf75ecfb705a9b643b3e4cb881ebb69f48 unpetrify-ref: gdbm-1.11 -- name: gettext-tarball - morph: strata/core/gettext-tarball.morph +- name: autopoint + morph: strata/core/autopoint.morph repo: upstream:gettext-tarball ref: 482840e61f86ca321838a91e902c41d40c098bbb unpetrify-ref: gettext-0.19.4 + build-depends: [] +- name: gettext-tiny + morph: strata/core/gettext-tiny.morph + repo: upstream:gettext-tiny + ref: eb8abea562725223ac74555879aae5a023215ba8 + unpetrify-ref: v0.0.4 + build-depends: [] - name: mini-utils morph: strata/core/mini-utils.morph repo: baserock:baserock/mini-utils - ref: 5293265b29bbf468ab9d7f3302b19dbc81d0f8b8 + ref: 6ca6ac97b9e1b17bebf49d34260927efe58b314e unpetrify-ref: master + build-depends: [] - name: ncurses morph: strata/core/ncurses.morph repo: upstream:ncurses @@ -77,7 +85,7 @@ chunks: unpetrify-ref: baserock/build-essential build-depends: - automake - - gettext-tarball + - autopoint - name: openssl-new morph: strata/core/openssl-new.morph repo: upstream:openssl-new @@ -120,9 +128,8 @@ chunks: build-depends: - autoconf-tarball - automake - - gettext-tarball + - autopoint - libtool-tarball - - gettext-tarball - name: help2man repo: upstream:help2man ref: 83bab7e2e8e24a380266a9a247c029c49b0de666 @@ -139,7 +146,7 @@ chunks: - autoconf-tarball - automake - flex - - gettext-tarball + - autopoint - help2man - mini-utils - name: pkg-config @@ -154,13 +161,14 @@ chunks: - name: attr morph: strata/core/attr.morph repo: upstream:attr - ref: 4b005410f865895d4dcd56e2c135278a7a315877 - unpetrify-ref: baserock/morph + ref: fdcd484ed6f5df9a2d60ae446c325f12e3d9d0b3 + unpetrify-ref: baserock/morph-musl build-depends: - autoconf-tarball - automake - - gettext-tarball + - autopoint - libtool-tarball + - gettext-tiny - name: acl morph: strata/core/acl.morph repo: upstream:acl @@ -169,18 +177,18 @@ chunks: build-depends: - autoconf-tarball - automake - - gettext-tarball + - autopoint - libtool-tarball - attr - name: linux-pam morph: strata/core/linux-pam.morph repo: upstream:linux-pam - ref: b1521c97e73b10469f7b34c0571d51c647eca83c - unpetrify-ref: Linux-PAM-1.1.8 + ref: a3ebc3aeb92ccf413253d934cf14169d1d36b15e + unpetrify-ref: baserock/v1.1.8-musl build-depends: - autoconf-tarball - automake - - gettext-tarball + - autopoint - libtool-tarball - pkg-config - flex @@ -194,7 +202,7 @@ chunks: build-depends: - autoconf-tarball - automake - - gettext-tarball + - autopoint - libtool-tarball - pkg-config - attr @@ -208,22 +216,18 @@ chunks: build-depends: - autoconf-tarball - automake - - gettext-tarball + - autopoint - libtool-tarball - bison - - attr - - acl - - linux-pam - - libcap2 - name: util-linux - morph: strata/core/util-linux.morph + morph: strata/core/util-linux-musl.morph repo: upstream:util-linux - ref: 34760e62e0d5a25262a6aa801b2f1df61216363f - unpetrify-ref: v2.26.1 + ref: d118c36d181352b9dd03d4f9b3203d588e410858 + unpetrify-ref: baserock/2.25.2-musl build-depends: - autoconf-tarball - automake - - gettext-tarball + - autopoint - libtool-tarball - pkg-config - linux-pam diff --git a/strata/core/attr.morph b/strata/core/attr.morph index 46d0b9c0..48c23225 100644 --- a/strata/core/attr.morph +++ b/strata/core/attr.morph @@ -15,4 +15,13 @@ configure-commands: --mandir="$PREFIX"/share/man \ --datadir="$PREFIX"/share install-commands: -- make DESTDIR="$DESTDIR" install-lib install-dev +- | + make DESTDIR="$DESTDIR" PKG_BIN_DIR="$DESTDIR$PREFIX"/bin \ + PKG_SBIN_DIR="$DESTDIR$PREFIX"/sbin \ + PKG_LIB_DIR="$DESTDIR$PREFIX"/lib64 \ + PKG_DEVLIB_DIR="$DESTDIR$PREFIX"/lib64 \ + PKG_INC_DIR="$DESTDIR$PREFIX"/include/attr \ + PKG_DATA_DIR="$DESTDIR$PREFIX"/share \ + PKG_MAN_DIR="$DESTDIR$PREFIX"/share/man \ + PKG_DOC_DIR="$DESTDIR$PREFIX"/share/doc/attr \ + install-lib install-dev diff --git a/strata/core/autopoint.morph b/strata/core/autopoint.morph new file mode 100644 index 00000000..0864993d --- /dev/null +++ b/strata/core/autopoint.morph @@ -0,0 +1,13 @@ +name: autopoint +kind: chunk +configure-commands: +- ./configure --prefix="$PREFIX" +build-commands: +- make +install-commands: +- install -d $DESTDIR$PREFIX/bin +- cd gettext-tools/misc ; install -m 755 autopoint "$DESTDIR$PREFIX/bin/autopoint" +- install -d $DESTDIR$PREFIX/share/gettext +- cd gettext-tools/misc ; install -m 644 archive.dir.tar.gz "$DESTDIR$PREFIX/share/gettext/archive.dir.tar.gz" +- cd gettext-runtime/m4 ; make install +- cd gettext-tools/m4 ; make install diff --git a/strata/core/gettext-tiny.morph b/strata/core/gettext-tiny.morph new file mode 100644 index 00000000..842c35ea --- /dev/null +++ b/strata/core/gettext-tiny.morph @@ -0,0 +1,6 @@ +name: gettext-tiny +kind: chunk +build-commands: +- make prefix=$PREFIX +install-commands: +- make prefix=$PREFIX install diff --git a/strata/core/shadow.morph b/strata/core/shadow.morph index c8715a7d..6887a6b3 100644 --- a/strata/core/shadow.morph +++ b/strata/core/shadow.morph @@ -2,52 +2,4 @@ name: shadow kind: chunk build-system: autotools configure-commands: -# Installing to /bin so that they overwrite busybox login. -- | - ./autogen.sh --with-selinux=no \ - --sysconfdir=/etc \ - --with-libpam=yes \ - --prefix="$PREFIX" \ - --bindir=/bin -post-install-commands: -# Disable things handled by pam instead -- | - for OPTION in FAIL_DELAY \ - FAILLOG_ENAB \ - LASTLOG_ENAB \ - MAIL_CHECK_ENAB \ - OBSCURE_CHECKS_ENAB \ - PORTTIME_CHECKS_ENAB \ - QUOTAS_ENAB \ - CONSOLE MOTD_FILE \ - FTMP_FILE \ - NOLOGINS_FILE \ - ENV_HZ \ - PASS_MIN_LEN \ - SU_WHEEL_ONLY \ - CRACKLIB_DICTPATH \ - PASS_CHANGE_TRIES \ - PASS_ALWAYS_WARN \ - CHFN_AUTH \ - ENVIRON_FILE - do - sed -i -e "s/^${OPTION}.*/# & #This option is handled by PAM instead./" \ - "$DESTDIR/etc/login.defs" - done -# ENCRYPT_METHOD is handled specially with PAM, it will use the default as -# provided in login.defs, but it may be overridden in the pam.d config. -# We do not currently override this though, and it's better to guard oursleves -# against accidentally reducing password security by forgetting to include the -# algorithm as an argument to the PAM module, so ENCRYPT_METHOD is configured -# here, rather than in PAM. -- | - if grep -q '[\s#]ENCRYPT_METHOD' "$DESTDIR/etc/login.defs"; then - sed -i -e '/^[\s#]*ENCRYPT_METHOD /s/.*/ENCRYPT_METHOD SHA512/g' "$DESTDIR/etc/login.defs" - else - echo 'ENCRYPT_METHOD SHA512' >>"$DESTDIR/etc/login.defs" - fi - -# The default pam.d config files have pam_selinux.so as a requirement, even -# when shadow is configured '--with-selinux=no'. We change this default config -# to make this requirement optional. -- sed -i -e 's/\(.*\)required\(.*pam_selinux.so.*\)/\1optional\2/' "$DESTDIR"/etc/pam.d/* +- ./autogen.sh --with-selinux=no --sysconfdir=/etc diff --git a/strata/core/util-linux-musl.morph b/strata/core/util-linux-musl.morph new file mode 100644 index 00000000..b3676b51 --- /dev/null +++ b/strata/core/util-linux-musl.morph @@ -0,0 +1,6 @@ +name: util-linux-musl +kind: chunk +build-system: autotools +configure-commands: +- ./autogen.sh +- ./configure --prefix="$PREFIX" --disable-use-tty-group --disable-nls -- cgit v1.2.1