From 8fc1c244dd05e723aac6ef5e5af49b8307a37cf2 Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Date: Tue, 3 Mar 2015 16:13:56 +0000
Subject: Fix builds of genivi-common-api components

Running `autoreconf -ivf` will generate some files needed for
./configure in the build-aux folder. But ./configure needs them in
the same folder.

The workaround is generate a symlink 'build-aux -> .' so the files
generated will end up next to the configure script.
---
 strata/genivi.morph                                | 2 ++
 strata/genivi/genivi-common-api-dbus-runtime.morph | 5 +++++
 strata/genivi/genivi-common-api-runtime.morph      | 5 +++++
 3 files changed, 12 insertions(+)
 create mode 100644 strata/genivi/genivi-common-api-dbus-runtime.morph
 create mode 100644 strata/genivi/genivi-common-api-runtime.morph

diff --git a/strata/genivi.morph b/strata/genivi.morph
index 24050b4c..c8fe1532 100644
--- a/strata/genivi.morph
+++ b/strata/genivi.morph
@@ -36,11 +36,13 @@ chunks:
   build-depends:
   - googletest
 - name: genivi-common-api-runtime
+  morph: strata/genivi/genivi-common-api-runtime.morph
   repo: upstream:genivi-common-api-runtime
   ref: 188abb5e24d6a2a7fdd7e5d150439a162621292c
   unpetrify-ref: 2.1.6
   build-depends: []
 - name: genivi-common-api-dbus-runtime
+  morph: strata/genivi/genivi-common-api-dbus-runtime.morph
   repo: upstream:genivi-common-api-dbus-runtime
   ref: 3372155b32a2cf3b05e1a2a13f6f8413069de33f
   unpetrify-ref: 2.1.6-p1
diff --git a/strata/genivi/genivi-common-api-dbus-runtime.morph b/strata/genivi/genivi-common-api-dbus-runtime.morph
new file mode 100644
index 00000000..8d6cb134
--- /dev/null
+++ b/strata/genivi/genivi-common-api-dbus-runtime.morph
@@ -0,0 +1,5 @@
+name: genivi-common-api-dbus-runtime
+kind: chunk
+build-system: autotools
+pre-configure-commands:
+- ln -s . build-aux
diff --git a/strata/genivi/genivi-common-api-runtime.morph b/strata/genivi/genivi-common-api-runtime.morph
new file mode 100644
index 00000000..7439331a
--- /dev/null
+++ b/strata/genivi/genivi-common-api-runtime.morph
@@ -0,0 +1,5 @@
+name: genivi-common-api-runtime
+kind: chunk
+build-system: autotools
+pre-configure-commands:
+- ln -s . build-aux
-- 
cgit v1.2.1


From b1fe8c5459e0fc193f656f4a8547c710b8554876 Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Date: Tue, 3 Mar 2015 16:09:25 +0000
Subject: Upgrade attr version and remove DESTDIR hack

This chunk was installing things in $DESTDIR$DESTDIR. For some reason
when creating the artifact morph ignores this error and creates the
artifact successfully, but some paths in files installed by attr were
wrong because they were including $DESTDIR on it:

  # grep attr.inst /usr/lib*/libattr.la
  libdir='/attr.inst/usr/lib64'
---
 strata/foundation.morph      |  2 +-
 strata/foundation/attr.morph | 24 ++++++++++++++----------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/strata/foundation.morph b/strata/foundation.morph
index 9a4a15ec..d85ed9c4 100644
--- a/strata/foundation.morph
+++ b/strata/foundation.morph
@@ -7,7 +7,7 @@ chunks:
 - name: attr
   morph: strata/foundation/attr.morph
   repo: upstream:attr
-  ref: bf32f1769e9895f8546570f0c841a945c93a5b22
+  ref: 4b005410f865895d4dcd56e2c135278a7a315877
   unpetrify-ref: baserock/morph
   build-depends: []
 - name: groff
diff --git a/strata/foundation/attr.morph b/strata/foundation/attr.morph
index 59158a90..46d0b9c0 100644
--- a/strata/foundation/attr.morph
+++ b/strata/foundation/attr.morph
@@ -1,14 +1,18 @@
 name: attr
 kind: chunk
-description:
-- 'The DESTDIR patch idea comes from: http://pkgs.fedoraproject.org/gitweb/?p=attr.git;a=blob_plain;f=attr-2.4.32-build.patch'
+build-system: autotools
 configure-commands:
-- sed -i -e 's,PKG_\(.*\)_DIR\t= ,PKG_\1_DIR\t= \$(DESTDIR),g' include/builddefs.in
-- sed -i -e 's,\$\$LOCAL_CONFIGURE_OPTIONS,\$(LOCAL_CONFIGURE_OPTIONS),g' Makefile
-- make LOCAL_CONFIGURE_OPTIONS="--prefix=/usr --exec-prefix=/usr --sbindir=/usr/sbin
-  --bindir=/usr/bin --libdir=/usr/lib --libexecdir=/usr/lib --enable-lib64=yes --includedir=/usr/include
-  --mandir=/usr/share/man --datadir=/usr/share" configure
-build-commands:
-- make SHELL=/bin/bash
+- 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 SHELL=/bin/bash DESTDIR="$DESTDIR" install-lib install-dev
+- make DESTDIR="$DESTDIR" install-lib install-dev
-- 
cgit v1.2.1