diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-01-30 17:07:10 +0000 |
---|---|---|
committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-01-30 17:07:10 +0000 |
commit | 971dc742e1c454ae5fade570faf4ec22aaf9b046 (patch) | |
tree | 5b84c43e897939b7993875990fb19397320175fc | |
parent | 3c719ffdc0b4dcb416a86d7e36eec9f7cd822c74 (diff) | |
parent | abef72d698a0ed48580cbedef5d8e1be058f906f (diff) | |
download | infrastructure-971dc742e1c454ae5fade570faf4ec22aaf9b046.tar.gz |
Merge remote-tracking branch 'baserock/master'
-rw-r--r-- | strata/audio-bluetooth.morph | 8 | ||||
-rw-r--r-- | strata/audio-bluetooth/pulseaudio.morph | 4 | ||||
-rw-r--r-- | strata/lvm/lvm2.morph | 2 |
3 files changed, 6 insertions, 8 deletions
diff --git a/strata/audio-bluetooth.morph b/strata/audio-bluetooth.morph index 0c67ee5c..e4dc0e68 100644 --- a/strata/audio-bluetooth.morph +++ b/strata/audio-bluetooth.morph @@ -77,8 +77,8 @@ chunks: - name: json-c morph: strata/audio-bluetooth/json-c.morph repo: upstream:json-c - ref: 60a5f3dedc879db3e5dacdd3b7e3e543c2e1bae7 - unpetrify-ref: baserock/morph + ref: e8bd6865d7a671e9f75ece05dfe86a19ba610581 + unpetrify-ref: baserock/json-c-0.12-20140410-plus-patch build-depends: [] - name: libsndfile morph: strata/audio-bluetooth/libsndfile.morph @@ -89,8 +89,8 @@ chunks: - name: pulseaudio morph: strata/audio-bluetooth/pulseaudio.morph repo: upstream:pulseaudio - ref: e1b44688c0db505f70761fe76b4fed2ca6924a09 - unpetrify-ref: baserock/morph + ref: 34862dbd43079d19faff31fa9ba996acc874d586 + unpetrify-ref: v5.99.3 build-depends: - libsndfile - libatomic_ops diff --git a/strata/audio-bluetooth/pulseaudio.morph b/strata/audio-bluetooth/pulseaudio.morph index 117f3396..fa183fcb 100644 --- a/strata/audio-bluetooth/pulseaudio.morph +++ b/strata/audio-bluetooth/pulseaudio.morph @@ -4,10 +4,8 @@ description: PulseAudio System build-system: autotools configure-commands: - ./autogen.sh -- ./configure --prefix="$PREFIX" --localstatedir=/var --sysconfdir=/etc --with-database=simple +- ./configure --prefix="$PREFIX" --localstatedir=/var --sysconfdir=/etc --with-database=simple --with-systemduserunitdir=/lib/systemd/system install-commands: - make DESTDIR="$DESTDIR" install -- mkdir -p "$DESTDIR/lib/systemd/system" -- install -m755 pulseaudio.service "$DESTDIR/lib/systemd/system" - mkdir -p "$DESTDIR/etc/systemd/system/multi-user.target.wants" - ln -s /lib/systemd/system/pulseaudio.service "$DESTDIR/etc/systemd/system/multi-user.target.wants/pulseaudio.service" diff --git a/strata/lvm/lvm2.morph b/strata/lvm/lvm2.morph index 791894df..9b4a68bf 100644 --- a/strata/lvm/lvm2.morph +++ b/strata/lvm/lvm2.morph @@ -11,7 +11,7 @@ configure-commands: - > ./configure --prefix="$PREFIX" \ --sbindir="$PREFIX"/sbin \ - --with-udev-prefix=/lib \ + --with-udev-prefix=/ \ --with-systemdsystemunitdir="$PREFIX"/lib/systemd/system \ --enable-applib --enable-cmdlib --enable-pkgconfig --enable-lvmetad \ --enable-dmeventd --enable-udev_sync |