Another pass of .oe cleanups.

BKrev: 405f6aa92YDm0pQN4padj00WWayDrQ

3 files changed, 51 insertions, 51 deletions

diff --git a/e2fsprogs-libs/e2fsprogs-libs_1.33.oe b/e2fsprogs-libs/e2fsprogs-libs_1.33.oe
index 63d739dd4d..146dc2cec6 100644
--- a/e2fsprogs-libs/e2fsprogs-libs_1.33.oe
+++ b/e2fsprogs-libs/e2fsprogs-libs_1.33.oe
@@ -4,12 +4,12 @@ PRIORITY = "optional"
 MAINTAINER = "Greg Gilbert <greg@treke.net>"
 RDEPENDS = "libc6"
 DEPENDS = "virtual/libc "
-FILES_e2fsprogs-libs-dev_append=" ${datadir}/et ${datadir}/ss"
+FILES_e2fsprogs-libs-dev_append = " ${datadir}/et ${datadir}/ss"
 
-SRC_URI=${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \
-	file://${FILESDIR}/configure.patch;patch=1 \
-	file://${FILESDIR}/compile-subst.patch;patch=1 \
-	file://${FILESDIR}/m4.patch;patch=1
+SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \
+	   file://${FILESDIR}/configure.patch;patch=1 \
+	   file://${FILESDIR}/compile-subst.patch;patch=1 \
+	   file://${FILESDIR}/m4.patch;patch=1"
 
 inherit autotools
 
@@ -18,15 +18,15 @@ do_stage () {
 	install -m 0644 lib/libss.a ${STAGING_LIBDIR}/
 	install -m 0644 lib/libuuid.a ${STAGING_LIBDIR}/
 	install -m 0644 lib/libblkid.a ${STAGING_LIBDIR}/
-	install -d ${STAGING_DIR}/target/include/et \
-		   ${STAGING_DIR}/target/include/ss \
-		   ${STAGING_DIR}/target/include/uuid \
-		   ${STAGING_DIR}/target/include/blkid
-	install -m 0644 lib/et/com_err.h ${STAGING_DIR}/target/include/et/
-	install -m 0644 lib/ss/ss.h ${STAGING_DIR}/target/include/ss/
-	install -m 0644 lib/ss/ss_err.h ${STAGING_DIR}/target/include/ss/
-	install -m 0644 lib/uuid/uuid.h ${STAGING_DIR}/target/include/uuid/
-	install -m 0644 lib/uuid/uuid_types.h ${STAGING_DIR}/target/include/uuid/
-	install -m 0644 lib/blkid/blkid.h ${STAGING_DIR}/target/include/blkid/
-	install -m 0644 lib/blkid/blkid_types.h ${STAGING_DIR}/target/include/blkid/
+	install -d ${STAGING_INCDIR}/et \
+		   ${STAGING_INCDIR}/ss \
+		   ${STAGING_INCDIR}/uuid \
+		   ${STAGING_INCDIR}/blkid
+	install -m 0644 lib/et/com_err.h ${STAGING_INCDIR}/et/
+	install -m 0644 lib/ss/ss.h ${STAGING_INCDIR}/ss/
+	install -m 0644 lib/ss/ss_err.h ${STAGING_INCDIR}/ss/
+	install -m 0644 lib/uuid/uuid.h ${STAGING_INCDIR}/uuid/
+	install -m 0644 lib/uuid/uuid_types.h ${STAGING_INCDIR}/uuid/
+	install -m 0644 lib/blkid/blkid.h ${STAGING_INCDIR}/blkid/
+	install -m 0644 lib/blkid/blkid_types.h ${STAGING_INCDIR}/blkid/
 }
diff --git a/e2fsprogs-libs/e2fsprogs-libs_1.34.oe b/e2fsprogs-libs/e2fsprogs-libs_1.34.oe
index b6075bf24e..4cd0c75a11 100644
--- a/e2fsprogs-libs/e2fsprogs-libs_1.34.oe
+++ b/e2fsprogs-libs/e2fsprogs-libs_1.34.oe
@@ -4,13 +4,13 @@ PRIORITY = "optional"
 MAINTAINER = "Greg Gilbert <greg@treke.net>"
 RDEPENDS = "libc6"
 DEPENDS = "virtual/libc "
-FILES_e2fsprogs-libs-dev_append=" ${datadir}/et ${datadir}/ss"
+FILES_e2fsprogs-libs-dev_append = " ${datadir}/et ${datadir}/ss"
 
-SRC_URI=${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \
-	file://${FILESDIR}/configure.patch;patch=1 \
-	file://${FILESDIR}/compile-subst.patch;patch=1 \
-	file://${FILESDIR}/m4.patch;patch=1 \
-	file://${FILESDIR}/ldflags.patch;patch=1
+SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \
+	   file://${FILESDIR}/configure.patch;patch=1 \
+	   file://${FILESDIR}/compile-subst.patch;patch=1 \
+	   file://${FILESDIR}/m4.patch;patch=1 \
+	   file://${FILESDIR}/ldflags.patch;patch=1"
 
 inherit autotools
 
@@ -24,15 +24,15 @@ do_stage () {
 	install -m 0644 lib/libss.a ${STAGING_LIBDIR}/
 	install -m 0644 lib/libuuid.a ${STAGING_LIBDIR}/
 	install -m 0644 lib/libblkid.a ${STAGING_LIBDIR}/
-	install -d ${STAGING_DIR}/target/include/et \
-		   ${STAGING_DIR}/target/include/ss \
-		   ${STAGING_DIR}/target/include/uuid \
-		   ${STAGING_DIR}/target/include/blkid
-	install -m 0644 lib/et/com_err.h ${STAGING_DIR}/target/include/et/
-	install -m 0644 lib/ss/ss.h ${STAGING_DIR}/target/include/ss/
-	install -m 0644 lib/ss/ss_err.h ${STAGING_DIR}/target/include/ss/
-	install -m 0644 lib/uuid/uuid.h ${STAGING_DIR}/target/include/uuid/
-	install -m 0644 lib/uuid/uuid_types.h ${STAGING_DIR}/target/include/uuid/
-	install -m 0644 lib/blkid/blkid.h ${STAGING_DIR}/target/include/blkid/
-	install -m 0644 lib/blkid/blkid_types.h ${STAGING_DIR}/target/include/blkid/
+	install -d ${STAGING_INCDIR}/et \
+		   ${STAGING_INCDIR}/ss \
+		   ${STAGING_INCDIR}/uuid \
+		   ${STAGING_INCDIR}/blkid
+	install -m 0644 lib/et/com_err.h ${STAGING_INCDIR}/et/
+	install -m 0644 lib/ss/ss.h ${STAGING_INCDIR}/ss/
+	install -m 0644 lib/ss/ss_err.h ${STAGING_INCDIR}/ss/
+	install -m 0644 lib/uuid/uuid.h ${STAGING_INCDIR}/uuid/
+	install -m 0644 lib/uuid/uuid_types.h ${STAGING_INCDIR}/uuid/
+	install -m 0644 lib/blkid/blkid.h ${STAGING_INCDIR}/blkid/
+	install -m 0644 lib/blkid/blkid_types.h ${STAGING_INCDIR}/blkid/
 }
diff --git a/e2fsprogs-libs/e2fsprogs-libs_1.35.oe b/e2fsprogs-libs/e2fsprogs-libs_1.35.oe
index b6075bf24e..89feceeefd 100644
--- a/e2fsprogs-libs/e2fsprogs-libs_1.35.oe
+++ b/e2fsprogs-libs/e2fsprogs-libs_1.35.oe
@@ -3,14 +3,14 @@ SECTION = "base"
 PRIORITY = "optional"
 MAINTAINER = "Greg Gilbert <greg@treke.net>"
 RDEPENDS = "libc6"
-DEPENDS = "virtual/libc "
-FILES_e2fsprogs-libs-dev_append=" ${datadir}/et ${datadir}/ss"
+DEPENDS = "virtual/libc"
+FILES_e2fsprogs-libs-dev_append = " ${datadir}/et ${datadir}/ss"
 
-SRC_URI=${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \
-	file://${FILESDIR}/configure.patch;patch=1 \
-	file://${FILESDIR}/compile-subst.patch;patch=1 \
-	file://${FILESDIR}/m4.patch;patch=1 \
-	file://${FILESDIR}/ldflags.patch;patch=1
+SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \
+	   file://${FILESDIR}/configure.patch;patch=1 \
+	   file://${FILESDIR}/compile-subst.patch;patch=1 \
+	   file://${FILESDIR}/m4.patch;patch=1 \
+	   file://${FILESDIR}/ldflags.patch;patch=1"
 
 inherit autotools
 
@@ -24,15 +24,15 @@ do_stage () {
 	install -m 0644 lib/libss.a ${STAGING_LIBDIR}/
 	install -m 0644 lib/libuuid.a ${STAGING_LIBDIR}/
 	install -m 0644 lib/libblkid.a ${STAGING_LIBDIR}/
-	install -d ${STAGING_DIR}/target/include/et \
-		   ${STAGING_DIR}/target/include/ss \
-		   ${STAGING_DIR}/target/include/uuid \
-		   ${STAGING_DIR}/target/include/blkid
-	install -m 0644 lib/et/com_err.h ${STAGING_DIR}/target/include/et/
-	install -m 0644 lib/ss/ss.h ${STAGING_DIR}/target/include/ss/
-	install -m 0644 lib/ss/ss_err.h ${STAGING_DIR}/target/include/ss/
-	install -m 0644 lib/uuid/uuid.h ${STAGING_DIR}/target/include/uuid/
-	install -m 0644 lib/uuid/uuid_types.h ${STAGING_DIR}/target/include/uuid/
-	install -m 0644 lib/blkid/blkid.h ${STAGING_DIR}/target/include/blkid/
-	install -m 0644 lib/blkid/blkid_types.h ${STAGING_DIR}/target/include/blkid/
+	install -d ${STAGING_INCDIR}/et \
+		   ${STAGING_INCDIR}/ss \
+		   ${STAGING_INCDIR}/uuid \
+		   ${STAGING_INCDIR}/blkid
+	install -m 0644 lib/et/com_err.h ${STAGING_INCDIR}/et/
+	install -m 0644 lib/ss/ss.h ${STAGING_INCDIR}/ss/
+	install -m 0644 lib/ss/ss_err.h ${STAGING_INCDIR}/ss/
+	install -m 0644 lib/uuid/uuid.h ${STAGING_INCDIR}/uuid/
+	install -m 0644 lib/uuid/uuid_types.h ${STAGING_INCDIR}/uuid/
+	install -m 0644 lib/blkid/blkid.h ${STAGING_INCDIR}/blkid/
+	install -m 0644 lib/blkid/blkid_types.h ${STAGING_INCDIR}/blkid/
 }