[oe-commits] org.oe.dev emacs: attemp to unbreak:

[koen commit]

emacs: attemp to unbreak:
* qemu-arm -> qemu-${TARGET_ARCH}
* PV = 20060801 -> 1:22.0.50+cvs20060801

fails in do_install now, #3524

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 1cc47b411e1d831dffa1fb35c962bb0deddf094d
ViewMTN: http://monotone.openembedded.org/revision/info/1cc47b411e1d831dffa1fb35c962bb0deddf094d
Files:
1
packages/emacs/emacs-x11_20060801.bb
packages/emacs/emacs-x11_cvs.bb
packages/emacs/emacs_20060801.bb
packages/emacs/emacs_cvs.bb
Diffs:

#
# mt diff -re5672c1952268d71a4b25b085fc8e327713f1dc5 -r1cc47b411e1d831dffa1fb35c962bb0deddf094d
#
# 
# 
# patch "packages/emacs/emacs-x11_20060801.bb"
#  from [3457ad840b0a38bfeae7e4a3897f212239fa70ce]
#    to [965432a87967e099882c8d5767b456e842a1cb0c]
# 
# patch "packages/emacs/emacs-x11_cvs.bb"
#  from [e2638065bea198c09881bfdf17fc0eb51453f52e]
#    to [322f28739cb2678d3893ad38afada26290e8a22c]
# 
# patch "packages/emacs/emacs_20060801.bb"
#  from [8060faa2c6603fe0867d73fd9f4b767a982fc6ee]
#    to [797283b86be34c26ed52e37b9e07109226c07cce]
# 
# patch "packages/emacs/emacs_cvs.bb"
#  from [d51efb8e267b4e8787cb7949c043ba6a32691233]
#    to [e47359e017c6c481251adade799880eb627f65a7]
# 
============================================================
--- packages/emacs/emacs-x11_20060801.bb	3457ad840b0a38bfeae7e4a3897f212239fa70ce
+++ packages/emacs/emacs-x11_20060801.bb	965432a87967e099882c8d5767b456e842a1cb0c
@@ -1,3 +1,5 @@ require emacs-x11_cvs.bb
 require emacs-x11_cvs.bb
-SRCDATE = "${PV}"
+
+SRCDATE = "20060801"
+
 DEFAULT_PREFERENCE = "0"
============================================================
--- packages/emacs/emacs-x11_cvs.bb	e2638065bea198c09881bfdf17fc0eb51453f52e
+++ packages/emacs/emacs-x11_cvs.bb	322f28739cb2678d3893ad38afada26290e8a22c
@@ -1,5 +1,8 @@ require emacs_cvs.bb
 require emacs_cvs.bb
+
 # full X (non-diet) is needed for X support
 DEPENDS += "libx11"
+
 EXTRA_OECONF = "--without-sound"
+
 RREPLACES = "emacs"
============================================================
--- packages/emacs/emacs_20060801.bb	8060faa2c6603fe0867d73fd9f4b767a982fc6ee
+++ packages/emacs/emacs_20060801.bb	797283b86be34c26ed52e37b9e07109226c07cce
@@ -1,3 +1,3 @@ require emacs_cvs.bb
 require emacs_cvs.bb
-SRCDATE = "${PV}"
+SRCDATE = "20060801"
 DEFAULT_PREFERENCE = "0"
============================================================
--- packages/emacs/emacs_cvs.bb	d51efb8e267b4e8787cb7949c043ba6a32691233
+++ packages/emacs/emacs_cvs.bb	e47359e017c6c481251adade799880eb627f65a7
@@ -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 @@ inherit autotools
 
 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"