diff options
| author | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2015-04-22 15:22:09 +0000 |
|---|---|---|
| committer | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2015-04-27 12:35:05 +0000 |
| commit | fda3df9834dfc55796085cb174b8c70de4e4dbb2 (patch) | |
| tree | 32b5cdf9c412e03edab2d291debe9cf54d393b2a /strata/core.morph | |
| parent | 71797241802b692f6be53b0aa4e5d61658c6792b (diff) | |
| download | definitions-fda3df9834dfc55796085cb174b8c70de4e4dbb2.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.
Move linux-pam, acl, and attr into core and make shadow depend on them
Change-Id: I1b00ca0158c31ce5f31c11fe60816434508a05a1
Diffstat (limited to 'strata/core.morph')
| -rw-r--r-- | strata/core.morph | 77 |
1 files changed, 66 insertions, 11 deletions
diff --git a/strata/core.morph b/strata/core.morph index cfdc52eb..fbdda5ca 100644 --- a/strata/core.morph +++ b/strata/core.morph @@ -234,25 +234,55 @@ 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 +- 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 - - git - libtool-tarball - pkg-config -- name: bc - repo: upstream:bc-tarball - ref: 0956d119432ff6a2e85bae1fa336df799cad70b0 + - flex + - attr + - acl +- name: libcap2 + morph: strata/core/libcap2.morph + repo: upstream:libcap2 + ref: 4f7cca1bc9c2a274edb39d351b65747010d3ba7b unpetrify-ref: baserock/morph build-depends: - - flex - - texinfo-tarball + - autoconf-tarball + - automake + - gettext-tarball + - libtool-tarball + - pkg-config + - attr + - acl + - linux-pam - name: shadow morph: strata/core/shadow.morph repo: upstream:shadow @@ -264,6 +294,31 @@ chunks: - gettext-tarball - libtool-tarball - bison + - attr + - acl + - linux-pam + - libcap2 +- 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: bc + repo: upstream:bc-tarball + ref: 0956d119432ff6a2e85bae1fa336df799cad70b0 + unpetrify-ref: baserock/morph + build-depends: + - flex + - texinfo-tarball - name: patch morph: strata/core/patch.morph repo: upstream:patch |