diff options
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/base.bbclass | 10 | ||||
| -rw-r--r-- | classes/sourcepkg.bbclass | 22 | ||||
| -rw-r--r-- | classes/src_distribute_local.bbclass | 12 |
3 files changed, 22 insertions, 22 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index b191940038..2f363127c6 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -81,7 +81,7 @@ def base_chk_file_vars(parser, localpath, params, data): if want_md5sum: try: - md5pipe = os.popen('PATH=%s md5sum %s' % (bb.data.getVar('PATH', data, True), localpath)) + md5pipe = os.popen('PATH=%s md5sum "%s"' % (bb.data.getVar('PATH', data, True), localpath)) md5data = (md5pipe.readline().split() or [ "" ])[0] md5pipe.close() except OSError, e: @@ -92,7 +92,7 @@ def base_chk_file_vars(parser, localpath, params, data): if want_sha256sum: try: - shapipe = os.popen('PATH=%s oe_sha256sum %s' % (bb.data.getVar('PATH', data, True), localpath)) + shapipe = os.popen('PATH=%s oe_sha256sum "%s"' % (bb.data.getVar('PATH', data, True), localpath)) sha256data = (shapipe.readline().split() or [ "" ])[0] shapipe.close() except OSError, e: @@ -131,14 +131,14 @@ def base_chk_file(parser, pn, pv, src_uri, localpath, data): # call md5(sum) and shasum try: - md5pipe = os.popen('PATH=%s md5sum %s' % (bb.data.getVar('PATH', data, True), localpath)) + md5pipe = os.popen('PATH=%s md5sum "%s"' % (bb.data.getVar('PATH', data, True), localpath)) md5data = (md5pipe.readline().split() or [ "" ])[0] md5pipe.close() except OSError: raise Exception("Executing md5sum failed") try: - shapipe = os.popen('PATH=%s oe_sha256sum %s' % (bb.data.getVar('PATH', data, True), localpath)) + shapipe = os.popen('PATH=%s oe_sha256sum "%s"' % (bb.data.getVar('PATH', data, True), localpath)) shadata = (shapipe.readline().split() or [ "" ])[0] shapipe.close() except OSError: @@ -813,7 +813,7 @@ def oe_unpack_file(file, data, url = None): (type, host, path, user, pswd, parm) = bb.decodeurl(url) if 'dos' in parm: cmd = '%s -a' % cmd - cmd = '%s %s' % (cmd, file) + cmd = "%s '%s'" % (cmd, file) elif os.path.isdir(file): destdir = "." filespath = bb.data.getVar("FILESPATH", data, 1).split(":") diff --git a/classes/sourcepkg.bbclass b/classes/sourcepkg.bbclass index 5aacf92d10..7c202af4c9 100644 --- a/classes/sourcepkg.bbclass +++ b/classes/sourcepkg.bbclass @@ -1,5 +1,5 @@ DEPLOY_DIR_SRC ?= "${DEPLOY_DIR}/sources" -EXCLUDE_FROM ?= ".pc autom4te.cache" +EXCLUDE_FROM ?= ".pc patches autom4te.cache" # used as part of a path. make sure it's set DISTRO ?= "openembedded" @@ -30,23 +30,23 @@ def get_src_tree(d): sourcepkg_do_create_orig_tgz(){ - mkdir -p ${DEPLOY_DIR_SRC} + mkdir -p ${DEPLOY_DIR_SRC}/${PN} cd ${WORKDIR} for i in ${EXCLUDE_FROM}; do echo $i >> temp/exclude-from-file done - src_tree=${@get_src_tree(d)} + src_tree=$(basename ${S}) echo $src_tree - oenote "Creating .orig.tar.gz in ${DEPLOY_DIR_SRC}/${P}.orig.tar.gz" - tar cvzf ${DEPLOY_DIR_SRC}/${P}.orig.tar.gz --exclude-from temp/exclude-from-file $src_tree + oenote "Creating .orig.tar.gz in ${DEPLOY_DIR_SRC}/${PN}/${P}.orig.tar.gz" + tar cvzf ${DEPLOY_DIR_SRC}/${PN}/${P}.orig.tar.gz --exclude-from temp/exclude-from-file $src_tree cp -pPR $src_tree $src_tree.orig } sourcepkg_do_archive_bb() { - src_tree=${@get_src_tree(d)} + src_tree=$(basename ${S}) dest=${WORKDIR}/$src_tree/${DISTRO} mkdir -p $dest @@ -86,27 +86,27 @@ sourcepkg_do_create_diff_gz(){ done - src_tree=${@get_src_tree(d)} + src_tree=$(basename ${S}) for i in `find . -maxdepth 1 -type f`; do mkdir -p $src_tree/${DISTRO}/files cp $i $src_tree/${DISTRO}/files done - oenote "Creating .diff.gz in ${DEPLOY_DIR_SRC}/${P}-${PR}.diff.gz" - LC_ALL=C TZ=UTC0 diff --exclude-from=temp/exclude-from-file -Naur $src_tree.orig $src_tree | gzip -c > ${DEPLOY_DIR_SRC}/${P}-${PR}.diff.gz + oenote "Creating .diff.gz in ${DEPLOY_DIR_SRC}/${PN}/${P}-${PR}.diff.gz" + LC_ALL=C TZ=UTC0 diff --exclude-from=temp/exclude-from-file -Naur $src_tree.orig $src_tree | gzip -c > ${DEPLOY_DIR_SRC}/${PN}/${P}-${PR}.diff.gz rm -rf $src_tree.orig } EXPORT_FUNCTIONS do_create_orig_tgz do_archive_bb do_dumpdata do_create_diff_gz do_create_orig_tgz[deptask] = "do_unpack" -do_create_diff_gz[deptask] = "do_patch" +do_create_diff_gz[deptask] = "do_configure" do_archive_bb[deptask] = "do_patch" do_dumpdata[deptask] = "do_unpack" addtask create_orig_tgz after do_unpack before do_patch addtask archive_bb after do_patch before do_dumpdata addtask dumpdata after do_archive_bb before do_create_diff_gz -addtask create_diff_gz after do_dumpdata before do_configure +addtask create_diff_gz after do_configure before do_compile diff --git a/classes/src_distribute_local.bbclass b/classes/src_distribute_local.bbclass index 5cec2880aa..8cf0b426c0 100644 --- a/classes/src_distribute_local.bbclass +++ b/classes/src_distribute_local.bbclass @@ -6,24 +6,24 @@ SRC_DISTRIBUTECOMMAND[dirs] = "${SRC_DISTRIBUTEDIR}/${LIC}/${PN}" # symlinks the files to the SRC_DISTRIBUTEDIR SRC_DISTRIBUTECOMMAND-symlink () { - test -e ${SRC}.md5 && ln -sf ${SRC}.md5 . - ln -sf ${SRC} . + test -e "${SRC}.md5" && ln -sf "${SRC}.md5" . + ln -sf "${SRC}" . } # copies the files to the SRC_DISTRIBUTEDIR SRC_DISTRIBUTECOMMAND-copy () { - test -e ${SRC}.md5 && cp -f ${SRC}.md5 . - cp -fr ${SRC} . + test -e "${SRC}.md5" && cp -f "${SRC}.md5" . + cp -fr "${SRC}" . } # moves the files to the SRC_DISTRIBUTEDIR and symlinks them back SRC_DISTRIBUTECOMMAND-move+symlink () { if ! [ -L ${SRC} ]; then mv ${SRC} . - ln -sf $PWD/`basename ${SRC}` ${SRC} + ln -sf $PWD/`basename "${SRC}"` "${SRC}" if [ -e ${SRC}.md5 ]; then mv ${SRC}.md5 . - ln -sf $PWD/`basename ${SRC}.md5` ${SRC}.md5 + ln -sf $PWD/`basename "${SRC}.md5"` "${SRC}.md5" fi fi } |