diff options
| author | Daniel Willmann <daniel@totalueberwachung.de> | 2007-12-23 11:34:37 +0000 |
|---|---|---|
| committer | Daniel Willmann <daniel@totalueberwachung.de> | 2007-12-23 11:34:37 +0000 |
| commit | 504661aa0fc08e8bd47a8409bb61f8e340ba6eaa (patch) | |
| tree | 8db73da4fecb77a259fa3435495162ad509e136f /classes | |
| parent | 787f243f097889a2abefcfd8a111bac420c3ed81 (diff) | |
| parent | 20e5fbe217c05900868741ec16b09092eaf0830a (diff) | |
merge of '7b528e427242c4fc04839c0b8e3f065248b5c0dc'
and 'd8bfa63aa913e7227790ba2d02253cfbecce61ab'
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/image.bbclass | 11 | ||||
| -rw-r--r-- | classes/package.bbclass | 6 |
2 files changed, 17 insertions, 0 deletions
diff --git a/classes/image.bbclass b/classes/image.bbclass index 312307c831..ca9c9458e1 100644 --- a/classes/image.bbclass +++ b/classes/image.bbclass @@ -125,6 +125,17 @@ insert_feed_uris () { # insert new feed-sources echo "src/gz $feed_name $feed_uri" >> ${IMAGE_ROOTFS}/etc/ipkg/${feed_name}-feed.conf done + + # Allow to use package deploy directory contents as quick devel-testing + # feed. This creates individual feed configs for each arch subdir of those + # specified as compatible for the current machine. + # NOTE: Development-helper feature, NOT a full-fledged feed. + if [ -n "${FEED_DEPLOYDIR_BASE_URI}" ]; then + for arch in ${PACKAGE_ARCHS} + do + echo "src/gz local-$arch ${FEED_DEPLOYDIR_BASE_URI}/$arch" >> ${IMAGE_ROOTFS}/etc/ipkg/local-$arch-feed.conf + done + fi } log_check() { diff --git a/classes/package.bbclass b/classes/package.bbclass index 37b9d83d97..ec8c3d97e2 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -149,6 +149,12 @@ def runstrip(file, d): bb.debug(1, "runstrip: skip %s" % file) return 0 + # If the file is in a .debug directory it was already stripped, + # don't do it again... + if os.path.dirname(file).endswith(".debug"): + bb.note("Already run strip") + return 0 + strip = bb.data.getVar("STRIP", d, 1) objcopy = bb.data.getVar("OBJCOPY", d, 1) |