summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/archiver.bbclass6
-rw-r--r--meta/classes/package_rpm.bbclass2
2 files changed, 7 insertions, 1 deletions
diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
index e321a0e362..af9f010dfc 100644
--- a/meta/classes/archiver.bbclass
+++ b/meta/classes/archiver.bbclass
@@ -37,8 +37,11 @@ ARCHIVER_MODE[recipe] ?= "0"
37DEPLOY_DIR_SRC ?= "${DEPLOY_DIR}/sources" 37DEPLOY_DIR_SRC ?= "${DEPLOY_DIR}/sources"
38ARCHIVER_TOPDIR ?= "${WORKDIR}/deploy-sources" 38ARCHIVER_TOPDIR ?= "${WORKDIR}/deploy-sources"
39ARCHIVER_OUTDIR = "${ARCHIVER_TOPDIR}/${TARGET_SYS}/${PF}/" 39ARCHIVER_OUTDIR = "${ARCHIVER_TOPDIR}/${TARGET_SYS}/${PF}/"
40ARCHIVER_RPMTOPDIR ?= "${WORKDIR}/deploy-sources-rpm"
41ARCHIVER_RPMOUTDIR = "${ARCHIVER_RPMTOPDIR}/${TARGET_SYS}/${PF}/"
40ARCHIVER_WORKDIR = "${WORKDIR}/archiver-work/" 42ARCHIVER_WORKDIR = "${WORKDIR}/archiver-work/"
41 43
44
42do_dumpdata[dirs] = "${ARCHIVER_OUTDIR}" 45do_dumpdata[dirs] = "${ARCHIVER_OUTDIR}"
43do_ar_recipe[dirs] = "${ARCHIVER_OUTDIR}" 46do_ar_recipe[dirs] = "${ARCHIVER_OUTDIR}"
44do_ar_original[dirs] = "${ARCHIVER_OUTDIR} ${ARCHIVER_WORKDIR}" 47do_ar_original[dirs] = "${ARCHIVER_OUTDIR} ${ARCHIVER_WORKDIR}"
@@ -117,6 +120,9 @@ python () {
117 if d.getVarFlag('ARCHIVER_MODE', 'srpm') == "1" and d.getVar('PACKAGES'): 120 if d.getVarFlag('ARCHIVER_MODE', 'srpm') == "1" and d.getVar('PACKAGES'):
118 if "package_rpm" in d.getVar('PACKAGE_CLASSES'): 121 if "package_rpm" in d.getVar('PACKAGE_CLASSES'):
119 d.appendVarFlag('do_deploy_archives', 'depends', ' %s:do_package_write_rpm' % pn) 122 d.appendVarFlag('do_deploy_archives', 'depends', ' %s:do_package_write_rpm' % pn)
123 d.appendVarFlag('do_package_write_rpm', 'dirs', ' ${ARCHIVER_RPMTOPDIR}')
124 d.appendVarFlag('do_package_write_rpm', 'sstate-inputdirs', ' ${ARCHIVER_RPMTOPDIR}')
125 d.appendVarFlag('do_package_write_rpm', 'sstate-outputdirs', ' ${DEPLOY_DIR_SRC}')
120 if ar_dumpdata == "1": 126 if ar_dumpdata == "1":
121 d.appendVarFlag('do_package_write_rpm', 'depends', ' %s:do_dumpdata' % pn) 127 d.appendVarFlag('do_package_write_rpm', 'depends', ' %s:do_dumpdata' % pn)
122 if ar_recipe == "1": 128 if ar_recipe == "1":
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 5dafb3e7cb..1a64cb271a 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -694,7 +694,7 @@ python do_package_rpm () {
694 cmd = cmd + " --define '_tmppath " + workdir + "'" 694 cmd = cmd + " --define '_tmppath " + workdir + "'"
695 if d.getVarFlag('ARCHIVER_MODE', 'srpm') == '1' and bb.data.inherits_class('archiver', d): 695 if d.getVarFlag('ARCHIVER_MODE', 'srpm') == '1' and bb.data.inherits_class('archiver', d):
696 cmd = cmd + " --define '_sourcedir " + d.getVar('ARCHIVER_OUTDIR') + "'" 696 cmd = cmd + " --define '_sourcedir " + d.getVar('ARCHIVER_OUTDIR') + "'"
697 cmdsrpm = cmd + " --define '_srcrpmdir " + d.getVar('ARCHIVER_OUTDIR') + "'" 697 cmdsrpm = cmd + " --define '_srcrpmdir " + d.getVar('ARCHIVER_RPMOUTDIR') + "'"
698 cmdsrpm = cmdsrpm + " -bs " + outspecfile 698 cmdsrpm = cmdsrpm + " -bs " + outspecfile
699 # Build the .src.rpm 699 # Build the .src.rpm
700 d.setVar('SBUILDSPEC', cmdsrpm + "\n") 700 d.setVar('SBUILDSPEC', cmdsrpm + "\n")