diff options
| author | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2015-04-22 15:22:09 +0000 |
|---|---|---|
| committer | Baserock Gerrit <gerrit@baserock.org> | 2015-04-29 14:59:42 +0000 |
| commit | aae1e3dec176ebc40cd233a29cf48c04d856fac5 (patch) | |
| tree | fa645c68b7345dbfc073a83ff4c712cdfe0c1286 /strata/foundation | |
| parent | 678a0e030366b5c33a44d8f5b42c12cdc3aa3f60 (diff) | |
| download | definitions-aae1e3dec176ebc40cd233a29cf48c04d856fac5.tar.gz | |
Fix linux-pam
This involves:
* Reordering the chunks linux-pam, acl, attr and libcap2 - this means
moving them into the 'core' stratum, and fixing errors that occur
because of the move.
* Configuring pam correctly.
* Fix acl failing to build in core.
* Fix shadow to build against pam and reconfigure shadow to not do
things covered by pam.
* Fix tar not building - I am not sure what caused this to fail to
build, but fixing it involved stopping it from trying to init
submodules that were already checked out.
Change-Id: I1b00ca0158c31ce5f31c11fe60816434508a05a1
Diffstat (limited to 'strata/foundation')
| -rw-r--r-- | strata/foundation/acl.morph | 6 | ||||
| -rw-r--r-- | strata/foundation/attr.morph | 18 | ||||
| -rw-r--r-- | strata/foundation/libcap2.morph | 6 | ||||
| -rw-r--r-- | strata/foundation/linux-pam.morph | 15 |
4 files changed, 0 insertions, 45 deletions
diff --git a/strata/foundation/acl.morph b/strata/foundation/acl.morph deleted file mode 100644 index c742d8ae..00000000 --- a/strata/foundation/acl.morph +++ /dev/null @@ -1,6 +0,0 @@ -name: acl -kind: chunk -build-commands: -- make -install-commands: -- make DESTDIR="$DESTDIR" install-dev diff --git a/strata/foundation/attr.morph b/strata/foundation/attr.morph deleted file mode 100644 index 46d0b9c0..00000000 --- a/strata/foundation/attr.morph +++ /dev/null @@ -1,18 +0,0 @@ -name: attr -kind: chunk -build-system: autotools -configure-commands: -- make configure -- | - ./configure --prefix="$PREFIX" \ - --exec-prefix="$PREFIX" \ - --sbindir="$PREFIX"/sbin \ - --bindir="$PREFIX"/bin \ - --libdir="$PREFIX"/lib \ - --libexecdir="$PREFIX"/lib \ - --enable-lib64=yes \ - --includedir="$PREFIX"/include \ - --mandir="$PREFIX"/share/man \ - --datadir="$PREFIX"/share -install-commands: -- make DESTDIR="$DESTDIR" install-lib install-dev diff --git a/strata/foundation/libcap2.morph b/strata/foundation/libcap2.morph deleted file mode 100644 index 3e4f205e..00000000 --- a/strata/foundation/libcap2.morph +++ /dev/null @@ -1,6 +0,0 @@ -name: libcap2 -kind: chunk -build-commands: -- make prefix="$PREFIX" -install-commands: -- make prefix="$PREFIX" DESTDIR="$DESTDIR" RAISE_SETFCAP=no install lib=lib diff --git a/strata/foundation/linux-pam.morph b/strata/foundation/linux-pam.morph deleted file mode 100644 index 0dfbe759..00000000 --- a/strata/foundation/linux-pam.morph +++ /dev/null @@ -1,15 +0,0 @@ -name: linux-pam -kind: chunk -build-system: autotools -pre-configure-commands: -- autoreconf -ivf -post-install-commands: -# sudo command is expecting this file. -- | - install -D -m 0644 /proc/self/fd/0 <<'EOF' "$DESTDIR"/etc/pam.d/other - #%PAM-1.0 - auth required pam_unix.so - account required pam_unix.so - password required pam_unix.so - session required pam_unix.so - EOF |