emacs: attemp to unbreak:

* qemu-arm -> qemu-${TARGET_ARCH}
* PV = 20060801 -> 1:22.0.50+cvs20060801
fails in do_install now, #3524

diff --git a/packages/emacs/emacs-x11_20060801.bb b/packages/emacs/emacs-x11_20060801.bb
index 8b598bf21f7fe978d4c0d4ed95fd1cec1c30decd..3878c42536be2fcda212dea2b6bfb4464978eb21 100644 (file)
--- a/packages/emacs/emacs-x11_20060801.bb
+++ b/packages/emacs/emacs-x11_20060801.bb
@@ -1,3 +1,5 @@
 require emacs-x11_cvs.bb
-SRCDATE = "${PV}"
+
+SRCDATE = "20060801"
+
 DEFAULT_PREFERENCE = "0"

diff --git a/packages/emacs/emacs-x11_cvs.bb b/packages/emacs/emacs-x11_cvs.bb
index 8fdba95742c0794ea1aea48291a7eb409e005b12..809176a3c3a5ead5989d30444f526b1581333033 100644 (file)
--- a/packages/emacs/emacs-x11_cvs.bb
+++ b/packages/emacs/emacs-x11_cvs.bb
@@ -1,5 +1,8 @@
 require emacs_cvs.bb
+
 # full X (non-diet) is needed for X support
 DEPENDS += "libx11"
+
 EXTRA_OECONF = "--without-sound"
+
 RREPLACES = "emacs"

diff --git a/packages/emacs/emacs_20060801.bb b/packages/emacs/emacs_20060801.bb
index aa72944eca25d5bbe4e081fcd32a63442764ca6a..834e5b6239bb4fc62b5ae8f06526c1e773f4de24 100644 (file)
--- a/packages/emacs/emacs_20060801.bb
+++ b/packages/emacs/emacs_20060801.bb
@@ -1,3 +1,3 @@
 require emacs_cvs.bb
-SRCDATE = "${PV}"
+SRCDATE = "20060801"
 DEFAULT_PREFERENCE = "0"

diff --git a/packages/emacs/emacs_cvs.bb b/packages/emacs/emacs_cvs.bb
index ef58dfa5b6e07b26edbd10d3a9e0b855fa7722f2..017f9313f4e24345e87d08944220fd44421fda11 100644 (file)
--- a/packages/emacs/emacs_cvs.bb
+++ b/packages/emacs/emacs_cvs.bb
@@ -7,7 +7,9 @@ DEPENDS += "qemu-native"
 #NOTE: I have found that this only works with qemu-0.8.0. If I use 0.8.1 or 0.8.2
 # the build gets hung up on compiling certain .el files
 
-PR = "r7"
+PV = "22.0.50+cvs${SRCDATE}" 
+PE = "1"
+PR = "r8"
 
 DEFAULT_PREFERENCE = "-1"
 
@@ -17,14 +19,14 @@ S = "${WORKDIR}/emacs"
 
 inherit autotools
 
-PACKAGES = "${PN}-el ${PN}-dbg ${PN} ${PN}-doc ${PN}-dev ${PN}-locale"
+PACKAGES += "${PN}-el"
 
-FILES_${PN}-el = "${datadir}/emacs/22.0.50/*/*.el.gz \
-                  ${datadir}/emacs/22.0.50/*/*/*.el.gz"
+FILES_${PN}-el = "${datadir}/emacs/*/*/*.el.gz \
+                  ${datadir}/emacs/*/*/*/*.el.gz"
 
 FILES_${PN} += "${datadir}/emacs"
 
-QEMU = "qemu-arm -L ${STAGING_DIR}/${TARGET_SYS}"
+QEMU = "qemu-${TARGET_ARCH} -L ${STAGING_DIR}/${TARGET_SYS}"
 LDFLAGS += "-L${CROSS_DIR}/${TARGET_SYS}/lib"
 
 EXTRA_OECONF = "--without-sound --without-x"