summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--meta/packages/quilt/quilt-native.inc10
-rw-r--r--meta/packages/quilt/quilt-native_0.47.bb5
-rw-r--r--meta/packages/quilt/quilt-package.inc10
-rw-r--r--meta/packages/quilt/quilt.inc20
-rw-r--r--meta/packages/quilt/quilt_0.47.bb10
5 files changed, 25 insertions, 30 deletions
diff --git a/meta/packages/quilt/quilt-native.inc b/meta/packages/quilt/quilt-native.inc
index fb34305d1..0eeaa87e1 100644
--- a/meta/packages/quilt/quilt-native.inc
+++ b/meta/packages/quilt/quilt-native.inc
@@ -1,11 +1,9 @@
-require quilt_${PV}.inc
-
SRC_URI_append_build-darwin = "? file://non-gnu.patch;patch=1 "
RDEPENDS_${PN} = "diffstat-native patch-native bzip2-native util-linux-native"
INHIBIT_AUTOTOOLS_DEPS = "1"
-inherit autotools native
+inherit native
PATCHTOOL = "patch"
EXTRA_OECONF = "--disable-nls"
@@ -13,9 +11,3 @@ EXTRA_OECONF = "--disable-nls"
do_configure () {
oe_runconf
}
-
-# Dummy quiltrc file for patch.bbclass
-do_install_append () {
- install -d ${STAGING_BINDIR_NATIVE}/
- touch ${STAGING_BINDIR_NATIVE}/quiltrc
-}
diff --git a/meta/packages/quilt/quilt-native_0.47.bb b/meta/packages/quilt/quilt-native_0.47.bb
index b61d5dac5..b6fefce9c 100644
--- a/meta/packages/quilt/quilt-native_0.47.bb
+++ b/meta/packages/quilt/quilt-native_0.47.bb
@@ -1,3 +1,4 @@
-PV = "0.47"
-PR = "r2"
+require quilt_${PV}.inc
require quilt-native.inc
+
+PR = "r2" \ No newline at end of file
diff --git a/meta/packages/quilt/quilt-package.inc b/meta/packages/quilt/quilt-package.inc
deleted file mode 100644
index bcdbcf026..000000000
--- a/meta/packages/quilt/quilt-package.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-PACKAGES += "guards guards-doc"
-FILES_${PN} = "${sysconfdir} ${datadir}/quilt \
- ${bindir}/quilt ${libdir}/quilt"
-FILES_guards = "${bindir}/guards"
-FILES_${PN}-doc = "${mandir}/man1/quilt.1 ${docdir}/${P}"
-FILES_guards-doc = "${mandir}/man1/guards.1"
-
-do_install () {
- oe_runmake 'BUILD_ROOT=${D}' install
-}
diff --git a/meta/packages/quilt/quilt.inc b/meta/packages/quilt/quilt.inc
index f0f5cb7d2..944990cd9 100644
--- a/meta/packages/quilt/quilt.inc
+++ b/meta/packages/quilt/quilt.inc
@@ -5,5 +5,21 @@ LICENSE = "GPL"
SRC_URI = "http://download.savannah.gnu.org/releases/quilt/quilt-${PV}.tar.gz "
-# quilt totally ignores DESTDIR
-PSTAGE_BROKEN_DESTDIR = "1"
+inherit autotools
+
+PACKAGES += "guards guards-doc"
+FILES_${PN} = "${sysconfdir} ${datadir}/quilt \
+ ${bindir}/quilt ${libdir}/quilt"
+FILES_guards = "${bindir}/guards"
+FILES_${PN}-doc = "${mandir}/man1/quilt.1 ${docdir}/${P}"
+FILES_guards-doc = "${mandir}/man1/guards.1"
+
+# quilt ignores DESTDIR
+do_install () {
+ oe_runmake 'BUILD_ROOT=${D}' install
+ if [ "${BUILD_ARCH}" == "${HOST_ARCH}" ]; then
+ # Dummy quiltrc file for patch.bbclass
+ install -d ${D}${bindir}/
+ touch ${D}${bindir}/quiltrc
+ fi
+}
diff --git a/meta/packages/quilt/quilt_0.47.bb b/meta/packages/quilt/quilt_0.47.bb
index 4de052635..67524316d 100644
--- a/meta/packages/quilt/quilt_0.47.bb
+++ b/meta/packages/quilt/quilt_0.47.bb
@@ -1,11 +1,7 @@
-RDEPENDS_${PN} += "patch diffstat bzip2 util-linux"
-
require quilt_${PV}.inc
-PR = "r1"
-
+RDEPENDS_${PN} += "patch diffstat bzip2 util-linux"
SRC_URI += "file://aclocal.patch;patch=1"
+PR = "r1"
-inherit autotools gettext
-
-require quilt-package.inc
+inherit gettext