summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Maw <jonathan.maw@codethink.co.uk>2015-04-20 14:43:46 +0000
committerJonathan Maw <jonathan.maw@codethink.co.uk>2015-04-21 13:26:18 +0000
commitaa9a482cc011a84628da11c61209ff23b12a1c61 (patch)
tree1f54791b2fb2cc6f3468ddc1eb4159890a4a4621
parent7c7ae27a0ca873a3f9d91512cd72358629c1d457 (diff)
downloaddefinitions-aa9a482cc011a84628da11c61209ff23b12a1c61.tar.gz
WIP: Make systemd sessions start on user login
This involves: * Make acl and pam build-depends of shadow * Make util-linux depend on pam and shadow I also had to: * Fix tar trying to init submodules as part of bootstrap
-rw-r--r--strata/core.morph61
-rw-r--r--strata/core/acl.morph (renamed from strata/foundation/acl.morph)1
-rw-r--r--strata/core/attr.morph (renamed from strata/foundation/attr.morph)0
-rw-r--r--strata/core/linux-pam.morph (renamed from strata/foundation/linux-pam.morph)0
-rw-r--r--strata/core/shadow.morph2
-rw-r--r--strata/coreutils-common/tar.morph3
-rw-r--r--strata/foundation.morph24
7 files changed, 53 insertions, 38 deletions
diff --git a/strata/core.morph b/strata/core.morph
index cae24f3f..37095a28 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -228,18 +228,6 @@ chunks:
- autoconf-tarball
- automake
- libtool-tarball
-- name: util-linux
- morph: strata/core/util-linux.morph
- repo: upstream:util-linux
- ref: b567c9cbc854a36da0a198e4dcc463e134d26a25
- unpetrify-ref: v2.25.2
- build-depends:
- - autoconf-tarball
- - automake
- - gettext-tarball
- - git
- - libtool-tarball
- - pkg-config
- name: nano
morph: strata/core/nano.morph
repo: upstream:nano-tarball
@@ -256,6 +244,39 @@ chunks:
build-depends:
- flex
- texinfo-tarball
+- name: attr
+ morph: strata/core/attr.morph
+ repo: upstream:attr
+ ref: 4b005410f865895d4dcd56e2c135278a7a315877
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - autoconf-tarball
+ - automake
+ - gettext-tarball
+ - libtool-tarball
+- name: acl
+ morph: strata/core/acl.morph
+ repo: upstream:acl
+ ref: f13e09bd54fd4a501c4952f002ed2752bdd9f93b
+ unpetrify-ref: v2.2.52
+ build-depends:
+ - autoconf-tarball
+ - automake
+ - gettext-tarball
+ - 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
+ build-depends:
+ - autoconf-tarball
+ - automake
+ - gettext-tarball
+ - libtool-tarball
+ - pkg-config
+ - flex
- name: shadow
morph: strata/core/shadow.morph
repo: upstream:shadow
@@ -267,6 +288,22 @@ chunks:
- gettext-tarball
- libtool-tarball
- bison
+ - acl
+ - linux-pam
+- name: util-linux
+ morph: strata/core/util-linux.morph
+ repo: upstream:util-linux
+ ref: b567c9cbc854a36da0a198e4dcc463e134d26a25
+ unpetrify-ref: v2.25.2
+ build-depends:
+ - autoconf-tarball
+ - automake
+ - gettext-tarball
+ - git
+ - libtool-tarball
+ - pkg-config
+ - linux-pam
+ - shadow
- name: patch
morph: strata/core/patch.morph
repo: upstream:patch
diff --git a/strata/foundation/acl.morph b/strata/core/acl.morph
index 4489f5d5..144dff0e 100644
--- a/strata/foundation/acl.morph
+++ b/strata/core/acl.morph
@@ -1,4 +1,5 @@
name: acl
kind: chunk
install-commands:
+- make DESTDIR="$DESTDIR" install-lib
- make DESTDIR="$DESTDIR" install-dev
diff --git a/strata/foundation/attr.morph b/strata/core/attr.morph
index 46d0b9c0..46d0b9c0 100644
--- a/strata/foundation/attr.morph
+++ b/strata/core/attr.morph
diff --git a/strata/foundation/linux-pam.morph b/strata/core/linux-pam.morph
index 0dfbe759..0dfbe759 100644
--- a/strata/foundation/linux-pam.morph
+++ b/strata/core/linux-pam.morph
diff --git a/strata/core/shadow.morph b/strata/core/shadow.morph
index 6887a6b3..5d5a72ee 100644
--- a/strata/core/shadow.morph
+++ b/strata/core/shadow.morph
@@ -2,4 +2,4 @@ name: shadow
kind: chunk
build-system: autotools
configure-commands:
-- ./autogen.sh --with-selinux=no --sysconfdir=/etc
+- ./autogen.sh --with-selinux=no --sysconfdir=/etc --with-pam=yes
diff --git a/strata/coreutils-common/tar.morph b/strata/coreutils-common/tar.morph
index d9ee3a36..17d6a597 100644
--- a/strata/coreutils-common/tar.morph
+++ b/strata/coreutils-common/tar.morph
@@ -2,7 +2,8 @@ name: tar
kind: chunk
build-system: autotools
pre-configure-commands:
-- bash bootstrap --skip-po
+- rm .gitmodules
+- bash bootstrap --skip-po --gnulib-srcdir="$(pwd)/gnulib" --paxutils-srcdir="$(pwd)/paxutils"
configure-commands:
# Configure flag notes:
# 1. Needed to run configure as root
diff --git a/strata/foundation.morph b/strata/foundation.morph
index 8b7b4e4d..815aae0f 100644
--- a/strata/foundation.morph
+++ b/strata/foundation.morph
@@ -4,11 +4,6 @@ description: Basic userland runtime system
build-depends:
- morph: strata/coreutils-common.morph
chunks:
-- name: attr
- morph: strata/foundation/attr.morph
- repo: upstream:attr
- ref: 4b005410f865895d4dcd56e2c135278a7a315877
- unpetrify-ref: baserock/morph
- name: groff
morph: strata/foundation/groff.morph
repo: upstream:groff-git
@@ -29,8 +24,6 @@ chunks:
repo: upstream:libcap2
ref: 4f7cca1bc9c2a274edb39d351b65747010d3ba7b
unpetrify-ref: baserock/morph
- build-depends:
- - attr
- name: libffi
morph: strata/foundation/libffi.morph
repo: upstream:libffi
@@ -67,11 +60,6 @@ chunks:
ref: 412eed473b557ed2172d81d76fa1e1f53c973a67
build-depends:
- libgpg-error
-- name: linux-pam
- morph: strata/foundation/linux-pam.morph
- repo: upstream:linux-pam
- ref: b1521c97e73b10469f7b34c0571d51c647eca83c
- unpetrify-ref: Linux-PAM-1.1.8
- name: systemd
morph: strata/foundation/systemd.morph
repo: upstream:systemd
@@ -83,7 +71,6 @@ chunks:
- kmod
- libcap2
- libgcrypt
- - linux-pam
- name: libusb
repo: upstream:libusb
ref: e11525c66c7dd2db466c8f5785ff0b37d6a99ec9
@@ -106,13 +93,6 @@ chunks:
repo: upstream:fuse
ref: d69e627e79862e2df4ff9ff1ddb0363c4520d8a8
unpetrify-ref: baserock/morph
-- name: acl
- morph: strata/foundation/acl.morph
- repo: upstream:acl
- ref: f13e09bd54fd4a501c4952f002ed2752bdd9f93b
- unpetrify-ref: v2.2.52
- build-depends:
- - attr
- name: e2fsprogs
morph: strata/foundation/e2fsprogs.morph
repo: upstream:e2fsprogs
@@ -124,8 +104,6 @@ chunks:
ref: 563ff3b07d85517e3589a1f2e6f45a8265e3f071
unpetrify-ref: v3.18.2
build-depends:
- - attr
- - acl
- lzo
- e2fsprogs
- name: dbus
@@ -148,8 +126,6 @@ chunks:
repo: baserock:baserock/tbdiff
ref: 47fb728f2432929868666afc915dbc5a64836c08
unpetrify-ref: master
- build-depends:
- - attr
- name: dbus-glib
repo: upstream:dbus-glib
ref: 397e8297d433547c9bf4150ddd2b9e0b4c39628c