diff options
Diffstat (limited to 'strata')
| -rw-r--r-- | strata/build-essential.morph | 2 | ||||
| -rw-r--r-- | strata/build-essential/busybox.morph | 41 | ||||
| -rw-r--r-- | strata/foundation.morph | 18 | ||||
| -rw-r--r-- | strata/foundation/systemd.morph | 13 | ||||
| -rw-r--r-- | strata/genivi.morph | 8 |
5 files changed, 30 insertions, 52 deletions
diff --git a/strata/build-essential.morph b/strata/build-essential.morph index 38bd60d8..d7b86648 100644 --- a/strata/build-essential.morph +++ b/strata/build-essential.morph @@ -261,7 +261,7 @@ chunks: - name: busybox morph: strata/build-essential/busybox.morph repo: upstream:busybox - ref: 8a801e0f024f1385d8e989b80b90443546bceae7 + ref: 772a98fec669cf881d7c1ea17631bc8560bccf5c unpetrify-ref: baserock/build-essential build-depends: - stage2-binutils diff --git a/strata/build-essential/busybox.morph b/strata/build-essential/busybox.morph index b0bb46f5..35f57357 100644 --- a/strata/build-essential/busybox.morph +++ b/strata/build-essential/busybox.morph @@ -57,12 +57,6 @@ configure-commands: build-commands: - make -- | - for fin in systemd-units/*.in - do - f=$(echo "$fin" | sed 's/\.in$//') - sed -e 's|@rootprefix@||g' "$fin" >"$f"; - done install-commands: - | @@ -70,41 +64,8 @@ install-commands: make CONFIG_PREFIX="$DESTDIR$PREFIX" install && chmod 6755 "$DESTDIR$PREFIX"/bin/busybox -- mkdir -p "$DESTDIR/var/spool/cron/crontabs" - -# Install systemd units -- mkdir -p "$DESTDIR/lib/systemd/system/multi-user.target.wants" -- | - for f in systemd-units/*.service; do - install -m 644 "$f" "$DESTDIR/lib/systemd/system"; - done -- | - for f in $(cd systemd-units; ls *.service | grep -v -F "@"); do - ln -s "../$f" "$DESTDIR/lib/systemd/system/multi-user.target.wants/"; - done - -# Install custom udev rule to run ifup for every network device detected -- mkdir -p "$DESTDIR/lib/udev/rules.d" -- for f in udev-rules/100-baserock.rules; do - install -m 644 "$f" "$DESTDIR/lib/udev/rules.d"; - done - -# Set up DHCP -- mkdir -p "$DESTDIR$PREFIX"/share/udhcpc -- cp examples/udhcp/simple.script "$DESTDIR$PREFIX"/share/udhcpc/default.script - -# Set up NTP -- install scripts/run-ntpd-with-config "$DESTDIR$PREFIX"/sbin/. -- install -d "$DESTDIR/etc" -- | - cat << EOF > "$DESTDIR/etc/ntpd.conf" - server 0.pool.ntp.org - server 1.pool.ntp.org - server 2.pool.ntp.org - server 3.pool.ntp.org - EOF - # Set up man environment variables +- mkdir -p "$DESTDIR"/etc - | cat << EOF > "$DESTDIR/etc/profile" # Set default pager to less diff --git a/strata/foundation.morph b/strata/foundation.morph index a652fbd6..efe8fcd5 100644 --- a/strata/foundation.morph +++ b/strata/foundation.morph @@ -19,8 +19,8 @@ chunks: - name: kmod morph: strata/foundation/kmod.morph repo: upstream:kmod - ref: 7f3b215d4e848afa74aea20a4c64f0cc1ef30eb4 - unpetrify-ref: baserock/morph + ref: ae58de0fcb4a6528dd365e23d383bbe2eaf2d566 + unpetrify-ref: v18 build-depends: [] - name: libcap2 morph: strata/foundation/libcap2.morph @@ -69,16 +69,26 @@ chunks: unpetrify-ref: baserock/genivi/dbus-1.8.8 build-depends: - glib +- name: libgpg-error + repo: upstream:libgpg-error + ref: a498812d767c59ae2b75b0c985f5280b139e7dc4 + build-depends: [] +- name: libgcrypt + repo: upstream:libgcrypt + ref: 412eed473b557ed2172d81d76fa1e1f53c973a67 + build-depends: + - libgpg-error - name: systemd morph: strata/foundation/systemd.morph repo: upstream:systemd - ref: a77af3ec96015b2382ea31020d0a14b482d10a76 - unpetrify-ref: baserock/morph + ref: 941a643569dc6b53d0b334276d2a3cc0ed159e88 + unpetrify-ref: v217 build-depends: - dbus-pre - gobject-introspection - kmod - libcap2 + - libgcrypt - pciutils - usbutils - name: lzo diff --git a/strata/foundation/systemd.morph b/strata/foundation/systemd.morph index 2a1933d7..1ee23cb8 100644 --- a/strata/foundation/systemd.morph +++ b/strata/foundation/systemd.morph @@ -6,16 +6,23 @@ configure-commands: - sh autogen.sh - ./configure --prefix="$PREFIX" --enable-xz --disable-manpages --sysconfdir=/etc --localstatedir=/var --libdir="$PREFIX/lib" --libexecdir="$PREFIX/libexec" --with-rootprefix= - --with-rootlibdir=/lib --with-firmware-path=/lib/firmware/updates:/lib/firmware + --with-rootlibdir=/lib install-commands: - make DESTDIR="$DESTDIR" install - mkdir -p "$DESTDIR"/sbin - ln -s /lib/systemd/systemd "$DESTDIR"/sbin/init - for f in telinit runlevel shutdown poweroff reboot halt; do ln -s /bin/systemctl "$DESTDIR/sbin/$f"; done -- rm -f "$DESTDIR/etc/udev/rules.d/80-net-name-slot.rules" -- touch "$DESTDIR/etc/udev/rules.d/80-net-name-slot.rules" - sed -e 's|@sushell@|/bin/sh|g' units/debug-shell.service.in >"$DESTDIR/etc/systemd/system/debug-shell.service" - sed -r -e '/Options=/s/,?strictatime//' "$DESTDIR/lib/systemd/system/tmp.mount" >"$DESTDIR/etc/systemd/system/tmp.mount" - touch "$DESTDIR/etc/machine-id" +post-install-commands: +- | + cat > "$DESTDIR/etc/systemd/network/10-dhcp.network" << "EOF" + [Match] + Name=en* + + [Network] + DHCP=yes + EOF diff --git a/strata/genivi.morph b/strata/genivi.morph index bd0a457d..24050b4c 100644 --- a/strata/genivi.morph +++ b/strata/genivi.morph @@ -18,8 +18,8 @@ chunks: - name: node-startup-controller morph: strata/genivi/node-startup-controller.morph repo: upstream:node-startup-controller - ref: c78fddaddc24a2c49f5ef18896c93403575295ae - unpetrify-ref: baserock/morph + ref: b77fb1dbb280ec45525853e52a362eafd736b400 + unpetrify-ref: baserock/systemd_v216 build-depends: - DLT-daemon - name: googletest @@ -71,8 +71,8 @@ chunks: - itzam-tarball - name: node-state-manager repo: upstream:node-state-manager - ref: dd4a86b9459537d2e85489b36abf80f34d12f098 - unpetrify-ref: baserock/genivi/baseline + ref: 30add4659e002f1df205cc36f71ef3141c10c1fb + unpetrify-ref: baserock/systemd_v216 build-depends: - DLT-daemon - persistence-client-library |