bitbake.conf: include bin dirs from BBPATH in PATH
PATCH 1/4 bitbake.conf: include bin dirs from BBPATH in PATH
From: Chris Larson <[email protected]>
---
bin/{ => darwin}/cp | 0
bin/{ => darwin}/sed | 0
conf/bitbake.conf | 5 +++--
conf/build/Power Macintosh-darwin.conf | 2 +-
conf/build/i386-darwin.conf | 2 +-
5 files changed, 5 insertions(+), 4 deletions(-)
rename bin/{ => darwin}/cp (100%)
rename bin/{ => darwin}/sed (100%)bin/darwin/cp renamed from bin/cp +0 -0
bin/darwin/sed renamed from bin/sed +0 -0
conf/bitbake.conf +3 -2
@@ -421,8 +421,9 @@ EXTRA_IMAGEDEPENDS = "" LIBTOOL_HAS_SYSROOT ?= "no" -PATH_prepend = "${STAGING_BINDIR_CROSS}:${STAGING_DIR_NATIVE}${sbindir_native}:${STAGING_BINDIR_NATIVE}:${STAGING_DIR_NATIVE}${base_sbindir_native}:${STAGING_DIR_NATIVE}/${base_bindir_native}:" -export PATH +BBPATH_BIN = "${@':'.join('%s/bin' % path for path in '${BBPATH}'.split(':'))}" +PATH =. "${BBPATH_BIN}:${STAGING_BINDIR_CROSS}:${STAGING_DIR_NATIVE}${sbindir_native}:${STAGING_BINDIR_NATIVE}:${STAGING_DIR_NATIVE}${base_sbindir_native}:${STAGING_DIR_NATIVE}/${base_bindir_native}:" +PATH[export] = "1" ################################################################## # Build utility info.
conf/build/Power Macintosh-darwin.conf +1 -1
@@ -1,4 +1,4 @@ -PATH =. "${@bb.which('${BBPATH}', 'bin')}:" +PATH =. "${@bb.which('${BBPATH}', 'bin')}/darwin:" BUILD_ARCH = "powerpc" require conf/build/darwin/utilities.inc
conf/build/i386-darwin.conf +1 -1
@@ -1,4 +1,4 @@ -PATH =. "${@bb.which('${BBPATH}', 'bin')}:" +PATH =. "${@bb.which('${BBPATH}', 'bin')}/darwin:" BUILD_CC_ARCH += "-m32" require conf/build/darwin/utilities.inc
Signature · 1 line
1.7.2.3
PATCH 2/4 Move stage-manager-* into bin/ rather than a recipe
From: Chris Larson <[email protected]>
---
{recipes/stage-manager/files => bin}/stage-manager | 3 --
.../stage-manager/files => bin}/stage-manager-ipkg | 26 ++++++++++----------
.../files => bin}/stage-manager-ipkg-build | 6 ++--
classes/base.bbclass | 5 +--
classes/packaged-staging.bbclass | 5 ----
recipes/stage-manager/stagemanager-native_0.0.1.bb | 26 --------------------
6 files changed, 18 insertions(+), 53 deletions(-)
rename {recipes/stage-manager/files => bin}/stage-manager (99%)
rename {recipes/stage-manager/files => bin}/stage-manager-ipkg (98%)
rename {recipes/stage-manager/files => bin}/stage-manager-ipkg-build (99%)
delete mode 100644 recipes/stage-manager/stagemanager-native_0.0.1.bbbin/stage-manager renamed from recipes/stage-manager/files/stage-manager +0 -3
@@ -151,6 +151,3 @@ if __name__ == "__main__": if found_difference: sys.exit(5) sys.exit(0) - - -
bin/stage-manager-ipkg renamed from recipes/stage-manager/files/stage-manager-ipkg +13 -13
@@ -131,15 +131,15 @@ Valid destinations are directories or one of the dest names from $IPKG_CONF:" >& IPKG_HTTP_PROXY=`ipkg_option http_proxy` IPKG_FTP_PROXY=`ipkg_option ftp_proxy` IPKG_NO_PROXY=`ipkg_option no_proxy` - if [ -n "$IPKG_HTTP_PROXY" ]; then + if [ -n "$IPKG_HTTP_PROXY" ]; then export http_proxy="$IPKG_HTTP_PROXY" fi - if [ -n "$IPKG_FTP_PROXY" ]; then + if [ -n "$IPKG_FTP_PROXY" ]; then export ftp_proxy="$IPKG_FTP_PROXY" fi - if [ -n "$IPKG_NO_PROXY" ]; then + if [ -n "$IPKG_NO_PROXY" ]; then export no_proxy="$IPKG_NO_PROXY" fi
@@ -175,7 +175,7 @@ Options: configuration file, (but can also be a directory name in a pinch). -o <offline_root> Use <offline_root> as the root for offline installation. - -offline <offline_root> + -offline <offline_root> Force Options (use when ipkg is too smart for its own good): -force-depends Make dependency checks warnings instead of errors
@@ -221,7 +221,7 @@ ipkg_download() { local proxyuser="" local proxypassword="" local proxyoption="" - + if [ -n "$IPKG_PROXY_USERNAME" ]; then proxyuser="--proxy-user=\"$IPKG_PROXY_USERNAME\"" proxypassword="--proxy-passwd=\"$IPKG_PROXY_PASSWORD\""
@@ -276,7 +276,7 @@ ipkg_update() { ipkg_list() { for src in `ipkg_src_names`; do - if ipkg_require_list $src; then + if ipkg_require_list $src; then # black magic... sed -ne " /^Package:/{
@@ -342,7 +342,7 @@ ipkg_info() { case $# in 0) cat $IPKG_LISTS_DIR/$src - ;; + ;; 1) ipkg_extract_paragraph $1 < $IPKG_LISTS_DIR/$src ;;
@@ -545,7 +545,7 @@ ipkg_safe_pkg_name() { } ipkg_set_depends() { - local pkg=$1; shift + local pkg=$1; shift local new_deps="$*" pkg=`ipkg_safe_pkg_name $pkg` ## setvar ${pkg}_depends "$new_deps"
@@ -672,7 +672,7 @@ Status: install ok not-installed" | ipkg_status_update_sd $sd $pkg new_pkgs="$new_pkgs $pkg" ### echo "Dependences not satisfied for $pkg: $remaining_deps" if [ $curcheck -ne `echo $pkgs|wc -w` ]; then - continue + continue fi fi
@@ -886,7 +886,7 @@ diff -u $dest/$conffile $IPKG_TMP/$pkg/data/$conffile" fi local owd=`pwd` - (cd $IPKG_TMP/$pkg/data/; tar cf - . | (cd $owd; cd $dest; tar xf -)) + (cd $IPKG_TMP/$pkg/data/; tar cf - . | (cd $owd; cd $dest; tar xf -)) rm -rf $IPKG_TMP/$pkg/data rmdir $IPKG_TMP/$pkg rm -f $IPKG_TMP/data.tar.gz $IPKG_TMP/data.tar
@@ -924,7 +924,7 @@ ipkg_install() { while [ $# -gt 0 ]; do local pkg="$1" shift - + case "$pkg" in http://* | ftp://*) local tmp_pkg_file="$IPKG_TMP/"`ipkg_file_part $pkg`
@@ -1013,7 +1013,7 @@ ipkg_upgrade_pkg() { return 0 fi - if [ "$avail_ver" = "$inst_ver" ]; then + if [ "$avail_ver" = "$inst_ver" ]; then echo "Package $pkg ($inst_ver) installed in $dest_name is up to date" elif ipkg-compare-versions $avail_ver '>>' $inst_ver; then echo "Upgrading $pkg ($dest_name) from $inst_ver to $avail_ver"
@@ -1037,7 +1037,7 @@ ipkg_upgrade() { else pkgs="$*" fi - + for pkg in $pkgs; do ipkg_upgrade_pkg $pkg done
bin/stage-manager-ipkg-build renamed from recipes/stage-manager/files/stage-manager-ipkg-build +3 -3
@@ -68,7 +68,7 @@ You probably want to chown these to a system user: " >&2 ls -ld $large_uid_files echo >&2 fi - + if [ ! -f "$CONTROL/control" ]; then echo "*** Error: Control file $pkg_dir/$CONTROL/control not found." >&2
@@ -109,7 +109,7 @@ You probably want to chown these to a system user: " >&2 source=`required_field Source` [ "$?" -ne 0 ] && PKG_ERROR=1 if [ -z "$source" ]; then - echo "The Source field contain the URL's or filenames of the source code and any patches" + echo "The Source field contain the URL's or filenames of the source code and any patches" echo "used to build this package. Either gnu-style tarballs or Debian source packages " echo "are acceptable. Relative filenames may be used if they are distributed in the same" echo "directory as the .ipk file."
@@ -196,7 +196,7 @@ case $# in ;; *) echo $usage >&2 - exit 1 + exit 1 ;; esac
classes/base.bbclass +2 -3
@@ -61,8 +61,7 @@ def base_deps(d): # that case though. # deps = "coreutils-native" - if bb.data.getVar('PN', d, True) in ("shasum-native", "stagemanager-native", - "coreutils-native"): + if bb.data.getVar('PN', d, True) in ("shasum-native", "coreutils-native"): deps = "" # INHIBIT_DEFAULT_DEPS doesn't apply to the patch command. Whether or not
@@ -76,7 +75,7 @@ def base_deps(d): bb.data.getVar('PN', d, True) not in \ ("linux-libc-headers-native", "quilt-native", "unifdef-native", "shasum-native", - "stagemanager-native", "coreutils-native"): + "coreutils-native"): deps += " linux-libc-headers-native" return deps
classes/packaged-staging.bbclass +0 -5
@@ -23,7 +23,6 @@ PSTAGE_SCAN_CMD ?= "find ${PSTAGE_TMPDIR_STAGE} \( -name "*.la" -o -name "*-conf PSTAGE_NATIVEDEPENDS = "\ shasum-native \ - stagemanager-native \ " BB_STAMP_WHITELIST = "${PSTAGE_NATIVEDEPENDS}"
@@ -75,10 +74,6 @@ python __anonymous() { # Add task dependencies if we're active, otherwise mark packaged staging # as inactive. if pstage_allowed: - deps = bb.data.getVarFlag('do_setscene', 'depends', d) or "" - deps += " stagemanager-native:do_populate_sysroot" - bb.data.setVarFlag('do_setscene', 'depends', deps, d) - policy = bb.data.getVar("BB_STAMP_POLICY", d, True) if policy == "whitelist" or policy == "full": deps = bb.data.getVarFlag('do_setscene', 'recrdeptask', d) or ""
recipes/stage-manager/stagemanager-native_0.0.1.bb deleted +0 -26
@@ -1,26 +0,0 @@ -DESCRIPTION = "Helper script for packaged-staging.bbclass" -PR = "r15" - -SRC_URI = "file://stage-manager \ - file://stage-manager-ipkg \ - file://stage-manager-ipkg-build " -LICENSE = "GPLv2" - -PACKAGE_ARCH = "all" - -inherit native - -DEPENDS = " " -PACKAGE_DEPENDS = " " -PATCHDEPENDENCY = "" -INHIBIT_DEFAULT_DEPS = "1" - -PSTAGING_DISABLED = "1" - -NATIVE_INSTALL_WORKS = "1" -do_install() { - install -d ${STAGING_BINDIR} - install -m 0755 ${WORKDIR}/stage-manager ${STAGING_BINDIR} - install -m 0755 ${WORKDIR}/stage-manager-ipkg ${STAGING_BINDIR} - install -m 0755 ${WORKDIR}/stage-manager-ipkg-build ${STAGING_BINDIR} -}
Signature · 1 line
1.7.2.3
PATCH 3/4 Add install wrapper rather than coreutils-native
In reply to Chris LarsonFrom: Chris Larson <[email protected]>
--- bin/darwin/cp | 2 +- bin/darwin/sed | 2 +- bin/install | 28 ++++++++++++++++++++++++++++ classes/base.bbclass | 28 +++++++++------------------- classes/gpe.bbclass | 2 +- classes/gpephone.bbclass | 2 +- recipes/twin/twin_0.4.6.bb | 1 - 7 files changed, 41 insertions(+), 24 deletions(-) create mode 100755 bin/install
bin/darwin/cp +1 -1
@@ -7,7 +7,7 @@ # - Otherwise, we stick to what SuSv3 defines -source $(dirname $0)/wrapper.sh +source $(dirname $0)/../wrapper.sh saved="" while getopts fpaRHLP opt; do
bin/darwin/sed +1 -1
@@ -21,7 +21,7 @@ # to reimplement -i internally in this script on some platforms. -source $(dirname $0)/wrapper.sh +source $(dirname $0)/../wrapper.sh case `uname -s` in Darwin)
bin/install new file +28 -0
@@ -0,0 +1,28 @@ +#!/bin/sh + +source $(dirname $0)/wrapper.sh + +saved="" +while getopts dbCcMpSsvB:f:g:m:o: opt; do + case "$opt" in + s) + # Ignore strip argument + ;; + B|f|g|m|o) + save "-$opt" + save "$OPTARG" + ;; + \?) + exit 1 + ;; + *) + save "-$opt" + ;; + esac +done +shift $(($OPTIND - 1)) +for arg; do + save "$arg" +done + +exec_real
classes/base.bbclass +9 -19
@@ -55,33 +55,23 @@ oe_runmake() { } def base_deps(d): - # - # Ideally this will check a flag so we will operate properly in - # the case where host == build == target, for now we don't work in - # that case though. - # - deps = "coreutils-native" - if bb.data.getVar('PN', d, True) in ("shasum-native", "coreutils-native"): - deps = "" - # INHIBIT_DEFAULT_DEPS doesn't apply to the patch command. Whether or not # we need that built is the responsibility of the patch function / class, not # the application. if not bb.data.getVar('INHIBIT_DEFAULT_DEPS', d): if (bb.data.getVar('HOST_SYS', d, 1) != - bb.data.getVar('BUILD_SYS', d, 1)): - deps += " virtual/${TARGET_PREFIX}gcc virtual/libc " + bb.data.getVar('BUILD_SYS', d, 1)): + return "virtual/${TARGET_PREFIX}gcc virtual/libc" elif bb.data.inherits_class('native', d) and \ bb.data.getVar('PN', d, True) not in \ ("linux-libc-headers-native", "quilt-native", - "unifdef-native", "shasum-native", - "coreutils-native"): - deps += " linux-libc-headers-native" - return deps + "unifdef-native", "shasum-native"): + return "linux-libc-headers-native" + return "" -DEPENDS_prepend="${@base_deps(d)} " -DEPENDS_virtclass-native_prepend="${@base_deps(d)} " -DEPENDS_virtclass-nativesdk_prepend="${@base_deps(d)} " +DEPENDS_prepend = "${@base_deps(d)} " +DEPENDS_virtclass-native_prepend = "${@base_deps(d)} " +DEPENDS_virtclass-nativesdk_prepend = "${@base_deps(d)} " SCENEFUNCS += "base_scenefunction"
@@ -89,7 +79,7 @@ SCENEFUNCS += "base_scenefunction" python base_scenefunction () { stamp = bb.data.getVar('STAMP', d, 1) + ".needclean" if os.path.exists(stamp): - bb.build.exec_func("do_clean", d) + bb.build.exec_func("do_clean", d) } python base_do_setscene () {
classes/gpe.bbclass +1 -1
@@ -1,4 +1,4 @@ -DEPENDS_prepend = "coreutils-native virtual/libintl intltool-native " +DEPENDS_prepend = "virtual/libintl intltool-native " GPE_TARBALL_SUFFIX ?= "gz" SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.${GPE_TARBALL_SUFFIX}" FILES_${PN} += "${datadir}/gpe ${datadir}/application-registry"
classes/gpephone.bbclass +1 -1
@@ -1,4 +1,4 @@ -DEPENDS_prepend = "coreutils-native virtual/libintl intltool-native " +DEPENDS_prepend = "virtual/libintl intltool-native " GPE_TARBALL_SUFFIX ?= "gz" SRC_URI = "${GPEPHONE_MIRROR}/${PN}-${PV}/${PN}-${PV}.tar.${GPE_TARBALL_SUFFIX}" FILES_${PN} += "${datadir}/gpe ${datadir}/application-registry"
recipes/twin/twin_0.4.6.bb +0 -1
@@ -1,7 +1,6 @@ DESCRIPTION = "Twin is a text-mode windowing environment: it draws and manages text windows on a text-mode display, like X11 does for graphical windows. It has a built-in window manager and terminal emulator, and can be used as server for remote clients in the same style as X11. It can display on Linux console, on X11 and inside itself." SECTION = "console/utils" -DEPENDS = "coreutils-native" LICENSE = "GPL LGPL" SRC_URI = "http://linuz.sns.it/~max/twin/twin-0.4.6.tar.gz \ file://cross_compile.patch"
Signature · 1 line
1.7.2.3
PATCH 4/4 bin/install: implement -D internally
In reply to Chris LarsonFrom: Chris Larson <[email protected]>
--- bin/install | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-)
bin/install +12 -1
@@ -1,9 +1,13 @@ #!/bin/sh +# +# Portability notes: +# - We allow what SuSv3 defines +# - We implement -D internally source $(dirname $0)/wrapper.sh saved="" -while getopts dbCcMpSsvB:f:g:m:o: opt; do +while getopts dbCcMpSsvB:f:g:m:o:D opt; do case "$opt" in s) # Ignore strip argument
@@ -12,6 +16,9 @@ while getopts dbCcMpSsvB:f:g:m:o: opt; do save "-$opt" save "$OPTARG" ;; + D) + createleading="1" + ;; \?) exit 1 ;;
@@ -25,4 +32,8 @@ for arg; do save "$arg" done +if [ $# == 2 -a -n "$createleading" ]; then + install -d $(dirname $2) +fi + exec_real
Signature · 1 line
1.7.2.3
Re: [PATCH 4/4] bin/install: implement -D internally
Quoted 3 lines · Chris Larson
From: Chris Larson<[email protected]>
Signed-off-by Chris Larson<[email protected]>
Fold this into #3?
Quoted 42 lines
--- bin/install | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-)bin/install +12
-1@@ -1,9 +1,13 @@ #!/bin/sh +# +# Portability notes: +# - We allow what SuSv3 defines +# - We implement -D internally source $(dirname $0)/wrapper.sh saved="" -while getopts dbCcMpSsvB:f:g:m:o: opt; do +while getopts dbCcMpSsvB:f:g:m:o:D opt; do case "$opt" in s) # Ignore strip argument@@ -12,6 +16,9 @@ while getopts dbCcMpSsvB:f:g:m:o: opt; do save "-$opt" save "$OPTARG" ;; + D) + createleading="1" + ;; \?) exit 1 ;;@@ -25,4 +32,8 @@ for arg; do save "$arg" done +if [ $# == 2 -a -n "$createleading" ]; then + install -d $(dirname $2) +fi + exec_real
Signature · 2 lines
Tom Rini Mentor Graphics Corporation
Quoted 3 lines · Chris Larson
From: Chris Larson <[email protected]>
Signed-off-by Chris Larson <[email protected]>
Quoted 63 lines
---
bin/{ => darwin}/cp | 0 bin/{ => darwin}/sed | 0conf/bitbake.conf| 5 +++-- conf/build/Power Macintosh-darwin.conf | 2 +-conf/build/i386-darwin.conf| 2 +-5 files changed, 5 insertions(+), 4 deletions(-)rename bin/{ => darwin}/cp (100%)
rename bin/{ => darwin}/sed (100%)bin/darwin/cp renamed from bin/cp +0
-0bin/darwin/sed renamed from bin/sed +0
-0conf/bitbake.conf +0
-0@@ -421,8 +421,9 @@ EXTRA_IMAGEDEPENDS = ""LIBTOOL_HAS_SYSROOT ?= "no"
conf/bitbake.conf +3
-2-PATH_prepend = "${STAGING_BINDIR_CROSS}:${STAGING_DIR_NATIVE}${sbindir_native}:${STAGING_BINDIR_NATIVE}:${STAGING_DIR_NATIVE}${base_sbindir_native}:${STAGING_DIR_NATIVE}/${base_bindir_native}:" -export PATH +BBPATH_BIN = "${@':'.join('%s/bin' % path for path in '${BBPATH}'.split(':'))}" +PATH =. "${BBPATH_BIN}:${STAGING_BINDIR_CROSS}:${STAGING_DIR_NATIVE}${sbindir_native}:${STAGING_BINDIR_NATIVE}:${STAGING_DIR_NATIVE}${base_sbindir_native}:${STAGING_DIR_NATIVE}/${base_bindir_native}:" +PATH[export] = "1"##################################################################
# Build utility info.conf/build/Power Macintosh-darwin.conf +1
-1@@ -1,4 +1,4 @@ -PATH =. "${@bb.which('${BBPATH}', 'bin')}:" +PATH =. "${@bb.which('${BBPATH}', 'bin')}/darwin:"BUILD_ARCH = "powerpc"
require conf/build/darwin/utilities.inc
conf/build/i386-darwin.conf +1
-1@@ -1,4 +1,4 @@ -PATH =. "${@bb.which('${BBPATH}', 'bin')}:" +PATH =. "${@bb.which('${BBPATH}', 'bin')}/darwin:"BUILD_CC_ARCH += "-m32"
require conf/build/darwin/utilities.inc
--
1.7.2.3_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [PATCH 2/4] Move stage-manager-* into bin/ rather than a recipe
In reply to Chris LarsonQuoted 3 lines · Chris Larson
From: Chris Larson <[email protected]>
Signed-off-by Chris Larson <[email protected]>
Quoted 264 lines
---
{recipes/stage-manager/files => bin}/stage-manager | 3 -- .../stage-manager/files => bin}/stage-manager-ipkg | 26 ++++++++++---------- .../files => bin}/stage-manager-ipkg-build | 6 ++-- classes/base.bbclass | 5 +-- classes/packaged-staging.bbclass | 5 ---- recipes/stage-manager/stagemanager-native_0.0.1.bb | 26 --------------------6 files changed, 18 insertions(+), 53 deletions(-)rename {recipes/stage-manager/files => bin}/stage-manager (99%) rename {recipes/stage-manager/files => bin}/stage-manager-ipkg (98%) rename {recipes/stage-manager/files => bin}/stage-manager-ipkg-build (99%) delete mode 100644 recipes/stage-manager/stagemanager-native_0.0.1.bb
bin/stage-manager renamed from recipes/stage-manager/files/stage-manager +0
-0@@ -151,6 +151,3 @@ if __name__ == "__main__":if
found_difference:
sys.exit(5)
sys.exit(0)bin/stage-manager renamed from recipes/stage-manager/files/stage-manager +0
-3- - -bin/stage-manager-ipkg renamed from recipes/stage-manager/files/stage-manager-ipkg +0
-0@@ -131,15 +131,15 @@ Valid destinations are directories or one of the dest names from $IPKG_CONF:" >&IPKG_HTTP_PROXY=
ipkg_option http_proxyIPKG_FTP_PROXY=ipkg_option ftp_proxyIPKG_NO_PROXY=ipkg_option no_proxy
- if [ -n "$IPKG_HTTP_PROXY" ]; then
+ if [ -n "$IPKG_HTTP_PROXY" ]; then export http_proxy="$IPKG_HTTP_PROXY" fi- if [ -n "$IPKG_FTP_PROXY" ]; then
+ if [ -n "$IPKG_FTP_PROXY" ]; then
export ftp_proxy="$IPKG_FTP_PROXY"
fi- if [ -n "$IPKG_NO_PROXY" ]; then
+ if [ -n "$IPKG_NO_PROXY" ]; then
export no_proxy="$IPKG_NO_PROXY"
fibin/stage-manager-ipkg renamed from recipes/stage-manager/files/stage-manager-ipkg +0
-0@@ -175,7 +175,7 @@ Options:configuration file, (but can also be a directory name in a pinch).
-o <offline_root> Use <offline_root> as the root for offline installation.
- -offline <offline_root>
+ -offline <offline_root>Force Options (use when ipkg is too smart for its own good):
-force-depends Make dependency checks warnings instead of errorsbin/stage-manager-ipkg renamed from recipes/stage-manager/files/stage-manager-ipkg +0
-0@@ -221,7 +221,7 @@ ipkg_download() {local proxyuser=""
local proxypassword=""
local proxyoption=""bin/stage-manager-ipkg renamed from recipes/stage-manager/files/stage-manager-ipkg +1
-1- +if [ -n "$IPKG_PROXY_USERNAME" ]; then proxyuser="--proxy-user=\"$IPKG_PROXY_USERNAME\"" proxypassword="--proxy-passwd=\"$IPKG_PROXY_PASSWORD\""
bin/stage-manager-ipkg renamed from recipes/stage-manager/files/stage-manager-ipkg +0
-0@@ -276,7 +276,7 @@ ipkg_update() { ipkg_list() {for src in
ipkg_src_names; do
- ifipkg_require_list$src; then
+ ifipkg_require_list$src; then# black magic... sed -ne " /^Package:/{bin/stage-manager-ipkg renamed from recipes/stage-manager/files/stage-manager-ipkg +0
-0@@ -342,7 +342,7 @@ ipkg_info() {case $# in
0)
cat $IPKG_LISTS_DIR/$src
- ;;
+ ;;
1)
ipkg_extract_paragraph $1 < $IPKG_LISTS_DIR/$src ;;bin/stage-manager-ipkg renamed from recipes/stage-manager/files/stage-manager-ipkg +1
-1@@ -545,7 +545,7 @@ ipkg_safe_pkg_name() { } ipkg_set_depends() { - local pkg=$1; shift + local pkg=$1; shiftlocal new_deps="$*"
pkg=ipkg_safe_pkg_name $pkg
## setvar ${pkg}_depends "$new_deps"bin/stage-manager-ipkg renamed from recipes/stage-manager/files/stage-manager-ipkg +0
-0@@ -672,7 +672,7 @@ Status: install ok not-installed" | ipkg_status_update_sd $sd $pkgnew_pkgs="$new_pkgs $pkg"
### echo "Dependences not satisfied for $pkg: $remaining_deps" if [ $curcheck -neecho $pkgs|wc -w]; then
- continue
+ continue
fi
fibin/stage-manager-ipkg renamed from recipes/stage-manager/files/stage-manager-ipkg +0
-0@@ -886,7 +886,7 @@ diff -u $dest/$conffile $IPKG_TMP/$pkg/data/$conffile"fi
local owd=
pwd
- (cd $IPKG_TMP/$pkg/data/; tar cf - . | (cd $owd; cd $dest; tar xf -))
+ (cd $IPKG_TMP/$pkg/data/; tar cf - . | (cd $owd; cd $dest; tar xf -)) rm -rf $IPKG_TMP/$pkg/data
rmdir $IPKG_TMP/$pkg
rm -f $IPKG_TMP/data.tar.gz $IPKG_TMP/data.tarbin/stage-manager-ipkg renamed from recipes/stage-manager/files/stage-manager-ipkg +0
-0@@ -924,7 +924,7 @@ ipkg_install() {while [ $# -gt 0 ]; do
local pkg="$1"
shiftbin/stage-manager-ipkg renamed from recipes/stage-manager/files/stage-manager-ipkg +1
-1- +case "$pkg" in
http://* | ftp://*)
local tmp_pkg_file="$IPKG_TMP/"ipkg_file_part $pkgbin/stage-manager-ipkg renamed from recipes/stage-manager/files/stage-manager-ipkg +0
-0@@ -1013,7 +1013,7 @@ ipkg_upgrade_pkg() {return 0
fi- if [ "$avail_ver" = "$inst_ver" ]; then
+ if [ "$avail_ver" = "$inst_ver" ]; then
echo "Package $pkg ($inst_ver) installed in $dest_name is up to date" elif ipkg-compare-versions $avail_ver '>>' $inst_ver; then echo "Upgrading $pkg ($dest_name) from $inst_ver to $avail_ver"bin/stage-manager-ipkg renamed from recipes/stage-manager/files/stage-manager-ipkg +0
-0@@ -1037,7 +1037,7 @@ ipkg_upgrade() {else
pkgs="$*"
fibin/stage-manager-ipkg renamed from recipes/stage-manager/files/stage-manager-ipkg +1
-1- +for pkg in $pkgs; do
ipkg_upgrade_pkg $pkg
donebin/stage-manager-ipkg-build renamed from recipes/stage-manager/files/stage-manager-ipkg-build +0
-0@@ -68,7 +68,7 @@ You probably want to chown these to a system user: " >&2ls -ld $large_uid_files
echo >&2
fibin/stage-manager-ipkg-build renamed from recipes/stage-manager/files/stage-manager-ipkg-build +1
-1- +if [ ! -f "$CONTROL/control" ]; then
echo "*** Error: Control file $pkg_dir/$CONTROL/control not found." >&2bin/stage-manager-ipkg-build renamed from recipes/stage-manager/files/stage-manager-ipkg-build +0
-0@@ -109,7 +109,7 @@ You probably want to chown these to a system user: " >&2source=
required_field Source
[ "$?" -ne 0 ] && PKG_ERROR=1
if [ -z "$source" ]; then
- echo "The Source field contain the URL's or filenames of the source code and any patches"
+ echo "The Source field contain the URL's or filenames of the source code and any patches" echo "used to build this package. Either gnu-style tarballs or Debian source packages " echo "are acceptable. Relative filenames may be used if they are distributed in the same" echo "directory as the .ipk file."bin/stage-manager-ipkg-build renamed from recipes/stage-manager/files/stage-manager-ipkg-build +0
-0@@ -196,7 +196,7 @@ case $# in ;; *)echo $usage >&2
- exit 1
+ exit 1
;;
esacclasses/base.bbclass +0
-0@@ -61,8 +61,7 @@ def base_deps(d): # that case though. #deps = "coreutils-native"
- ifbb.data.getVar('PN', d, True)in ("shasum-native", "stagemanager-native",
- "coreutils-native"):
+ ifbb.data.getVar('PN', d, True)in ("shasum-native", "coreutils-native"):
deps = ""#
INHIBIT_DEFAULT_DEPSdoesn't apply to the patch command. Whether or notclasses/base.bbclass +1
-1@@ -76,7 +75,7 @@ def base_deps(d): bb.data.getVar('PN', d, True) not in \ ("linux-libc-headers-native", "quilt-native", "unifdef-native", "shasum-native", - "stagemanager-native", "coreutils-native"): + "coreutils-native"):deps += " linux-libc-headers-native" return deps
classes/packaged-staging.bbclass +0
-1@@ -23,7 +23,6 @@ PSTAGE_SCAN_CMD ?= "find ${PSTAGE_TMPDIR_STAGE} \( -name "*.la" -o -name "*-conf PSTAGE_NATIVEDEPENDS = "\ shasum-native \ - stagemanager-native \"
BB_STAMP_WHITELIST = "${PSTAGE_NATIVEDEPENDS}"
classes/packaged-staging.bbclass +0
-0@@ -75,10 +74,6 @@ python __anonymous() { # Add task dependencies if we're active, otherwise mark packaged staging # as inactive.if
pstage_allowed:
- deps =bb.data.getVarFlag('do_setscene', 'depends', d)or ""
- deps += " stagemanager-native:do_populate_sysroot"
- bb.data.setVarFlag('do_setscene', 'depends', deps, d) -
policy =bb.data.getVar("BB_STAMP_POLICY", d, True)
if policy == "whitelist" or policy == "full":
deps =bb.data.getVarFlag('do_setscene', 'recrdeptask', d)or ""recipes/stage-manager/stagemanager-native_0.0.1.bb deleted +0
-27@@ -1,26 +0,0 @@ -DESCRIPTION = "Helper script for packaged-staging.bbclass" -PR = "r15" - -SRC_URI = "file://stage-manager \ - file://stage-manager-ipkg \ - file://stage-manager-ipkg-build " -LICENSE = "GPLv2" - -PACKAGE_ARCH = "all" - -inherit native - -DEPENDS = " " -PACKAGE_DEPENDS = " " -PATCHDEPENDENCY = "" -INHIBIT_DEFAULT_DEPS = "1" - -PSTAGING_DISABLED = "1" - -NATIVE_INSTALL_WORKS = "1" -do_install() { - install -d ${STAGING_BINDIR} - install -m 0755 ${WORKDIR}/stage-manager ${STAGING_BINDIR} - install -m 0755 ${WORKDIR}/stage-manager-ipkg ${STAGING_BINDIR} - install -m 0755 ${WORKDIR}/stage-manager-ipkg-build ${STAGING_BINDIR} -} --1.7.2.3
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [PATCH 3/4] Add install wrapper rather than coreutils-native
In reply to Chris LarsonQuoted 3 lines · Chris Larson
From: Chris Larson <[email protected]>
Signed-off-by Chris Larson <[email protected]>
Quoted 167 lines
---
bin/darwin/cp | 2 +-
bin/darwin/sed | 2 +-
bin/install | 28 ++++++++++++++++++++++++++++ classes/base.bbclass | 28 +++++++++------------------- classes/gpe.bbclass | 2 +- classes/gpephone.bbclass | 2 +- recipes/twin/twin_0.4.6.bb | 1 -7 files changed, 41 insertions(+), 24 deletions(-)create mode 100755 bin/install
bin/darwin/cp +1
-1@@ -7,7 +7,7 @@ # - Otherwise, we stick to what SuSv3 defines -source $(dirname $0)/wrapper.sh +source $(dirname $0)/../wrapper.shsaved=""
while getopts fpaRHLP opt; dobin/darwin/sed +1
-1@@ -21,7 +21,7 @@ # to reimplement -i internally in this script on some platforms. -source $(dirname $0)/wrapper.sh +source $(dirname $0)/../wrapper.shcase
uname -sin
Darwin)bin/install new file +28
-0@@ -0,0 +1,28 @@ +#!/bin/sh + +source $(dirname $0)/wrapper.sh + +saved="" +while getopts dbCcMpSsvB:f:g:m:o: opt; do + case "$opt" in + s) + # Ignore strip argument + ;; + B|f|g|m|o) + save "-$opt" + save "$OPTARG" + ;; + \?) + exit 1 + ;; + *) + save "-$opt" + ;; + esac +done +shift $(($OPTIND - 1)) +for arg; do + save "$arg" +done + +exec_realclasses/base.bbclass +0
-0@@ -55,33 +55,23 @@ oe_runmake() { }def
base_deps(d):
- #
- # Ideally this will check a flag so we will operate properly in
- # the case where host == build == target, for now we don't work in
- # that case though.
- #
- deps = "coreutils-native"
- ifbb.data.getVar('PN', d, True)in ("shasum-native", "coreutils-native"):
- deps = ""
-
#INHIBIT_DEFAULT_DEPSdoesn't apply to the patch command. Whether or not# we need that built is the responsibility of the patch function / class, not # the application. if not bb.data.getVar('INHIBIT_DEFAULT_DEPS', d): if (bb.data.getVar('HOST_SYS', d, 1) != - bb.data.getVar('BUILD_SYS', d, 1)): - deps += " virtual/${TARGET_PREFIX}gcc virtual/libc " + bb.data.getVar('BUILD_SYS', d, 1)): + return "virtual/${TARGET_PREFIX}gcc virtual/libc" elif bb.data.inherits_class('native', d) and \ bb.data.getVar('PN', d, True) not in \ ("linux-libc-headers-native", "quilt-native", - "unifdef-native", "shasum-native", - "coreutils-native"): - deps += " linux-libc-headers-native" - return deps + "unifdef-native", "shasum-native"): + return "linux-libc-headers-native" + return ""classes/base.bbclass +3
-3-DEPENDS_prepend="${@base_deps(d)} " -DEPENDS_virtclass-native_prepend="${@base_deps(d)} " -DEPENDS_virtclass-nativesdk_prepend="${@base_deps(d)} " +DEPENDS_prepend = "${@base_deps(d)} " +DEPENDS_virtclass-native_prepend = "${@base_deps(d)} " +DEPENDS_virtclass-nativesdk_prepend = "${@base_deps(d)} "SCENEFUNCS += "
base_scenefunction"classes/base.bbclass +0
-0@@ -89,7 +79,7 @@ SCENEFUNCS += "base_scenefunction" python base_scenefunction () {stamp =
bb.data.getVar('STAMP', d, 1)+ ".needclean" ifos.path.exists(stamp):
-bb.build.exec_func("do_clean", d)
+bb.build.exec_func("do_clean", d)}python
base_do_setscene() {classes/gpe.bbclass +1
-1@@ -1,4 +1,4 @@ -DEPENDS_prepend = "coreutils-native virtual/libintl intltool-native " +DEPENDS_prepend = "virtual/libintl intltool-native "GPE_TARBALL_SUFFIX ?= "gz"
SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.${GPE_TARBALL_SUFFIX}" FILES_${PN} += "${datadir}/gpe ${datadir}/application-registry"classes/gpephone.bbclass +1
-1@@ -1,4 +1,4 @@ -DEPENDS_prepend = "coreutils-native virtual/libintl intltool-native " +DEPENDS_prepend = "virtual/libintl intltool-native "GPE_TARBALL_SUFFIX ?= "gz"
SRC_URI = "${GPEPHONE_MIRROR}/${PN}-${PV}/${PN}-${PV}.tar.${GPE_TARBALL_SUFFIX}" FILES_${PN} += "${datadir}/gpe ${datadir}/application-registry"recipes/twin/twin_0.4.6.bb +0
-0@@ -1,7 +1,6 @@DESCRIPTION = "Twin is a text-mode windowing environment: it draws and manages text windows on a text-mode display, like X11 does for graphical windows. It has a built-in window manager and terminal emulator, and can be used as server for remote clients in the same style as X11. It can display on Linux console, on X11 and inside itself." SECTION = "console/utils"
-DEPENDS = "coreutils-native"
LICENSE = "GPL LGPL"
SRC_URI = "http://linuz.sns.it/~max/twin/twin-0.4.6.tar.gz \
file://cross_compile.patch"
--
1.7.2.3_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [PATCH 4/4] bin/install: implement -D internally
In reply to Chris LarsonQuoted 3 lines · Chris Larson
From: Chris Larson <[email protected]>
Signed-off-by Chris Larson <[email protected]>
Quoted 51 lines
---
bin/install | 13 ++++++++++++-1 files changed, 12 insertions(+), 1 deletions(-)bin/install +4
-0@@ -1,9 +1,13 @@ #!/bin/sh +# +# Portability notes: +# - We allow what SuSv3 defines +# - We implement -D internallysource $(dirname $0)/wrapper.sh
saved=""
bin/install +1
-1-while getopts dbCcMpSsvB:f:g:m:o: opt; do +while getopts dbCcMpSsvB:f:g:m:o:D opt; docase "$opt" in
s)
# Ignore strip argumentbin/install +0
-0@@ -12,6 +16,9 @@ while getopts dbCcMpSsvB:f:g:m:o: opt; dosave "-$opt"
save "$OPTARG"
;;
+ D)
+ createleading="1"
+ ;;
\?)
exit 1
;;bin/install +0
-0@@ -25,4 +32,8 @@ for arg; dosave "$arg"
donebin/install +4
-0+if [ $# == 2 -a -n "$createleading" ]; then + install -d $(dirname $2) +fi +exec_real
--
1.7.2.3_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [PATCH 2/4] Move stage-manager-* into bin/ rather than a recipe
In reply to Chris LarsonQuoted 3 lines · Chris Larson
From: Chris Larson<[email protected]>
Signed-off-by Chris Larson<[email protected]>
Quoted 255 lines
--- {recipes/stage-manager/files => bin}/stage-manager | 3 -- .../stage-manager/files => bin}/stage-manager-ipkg | 26 ++++++++++---------- .../files => bin}/stage-manager-ipkg-build | 6 ++-- classes/base.bbclass | 5 +-- classes/packaged-staging.bbclass | 5 ---- recipes/stage-manager/stagemanager-native_0.0.1.bb | 26 -------------------- 6 files changed, 18 insertions(+), 53 deletions(-) rename {recipes/stage-manager/files => bin}/stage-manager (99%) rename {recipes/stage-manager/files => bin}/stage-manager-ipkg (98%) rename {recipes/stage-manager/files => bin}/stage-manager-ipkg-build (99%)delete mode 100644 recipes/stage-manager/stagemanager-native_0.0.1.bb
bin/stage-manager renamed from recipes/stage-manager/files/stage-manager +0
-3@@ -151,6 +151,3 @@ if __name__ == "__main__": if found_difference: sys.exit(5) sys.exit(0) - - -bin/stage-manager-ipkg renamed from recipes/stage-manager/files/stage-manager-ipkg +13
-13@@ -131,15 +131,15 @@ Valid destinations are directories or one of the dest names from $IPKG_CONF:">& IPKG_HTTP_PROXY=`ipkg_option http_proxy` IPKG_FTP_PROXY=`ipkg_option ftp_proxy` IPKG_NO_PROXY=`ipkg_option no_proxy` - if [ -n "$IPKG_HTTP_PROXY" ]; then + if [ -n "$IPKG_HTTP_PROXY" ]; then export http_proxy="$IPKG_HTTP_PROXY" fi - if [ -n "$IPKG_FTP_PROXY" ]; then + if [ -n "$IPKG_FTP_PROXY" ]; then export ftp_proxy="$IPKG_FTP_PROXY" fi - if [ -n "$IPKG_NO_PROXY" ]; then + if [ -n "$IPKG_NO_PROXY" ]; then export no_proxy="$IPKG_NO_PROXY" fi@@ -175,7 +175,7 @@ Options: configuration file, (but can also be a directory name in a pinch). -o<offline_root> Use<offline_root> as the root for offline installation. - -offline<offline_root> + -offline<offline_root> Force Options (use when ipkg is too smart for its own good): -force-depends Make dependency checks warnings instead of errors@@ -221,7 +221,7 @@ ipkg_download() { local proxyuser="" local proxypassword="" local proxyoption="" - + if [ -n "$IPKG_PROXY_USERNAME" ]; then proxyuser="--proxy-user=\"$IPKG_PROXY_USERNAME\"" proxypassword="--proxy-passwd=\"$IPKG_PROXY_PASSWORD\""@@ -276,7 +276,7 @@ ipkg_update() { ipkg_list() { for src in `ipkg_src_names`; do - if ipkg_require_list $src; then + if ipkg_require_list $src; then # black magic... sed -ne " /^Package:/{@@ -342,7 +342,7 @@ ipkg_info() { case $# in 0) cat $IPKG_LISTS_DIR/$src - ;; + ;; 1) ipkg_extract_paragraph $1< $IPKG_LISTS_DIR/$src ;;@@ -545,7 +545,7 @@ ipkg_safe_pkg_name() { } ipkg_set_depends() { - local pkg=$1; shift + local pkg=$1; shift local new_deps="$*" pkg=`ipkg_safe_pkg_name $pkg` ## setvar ${pkg}_depends "$new_deps"@@ -672,7 +672,7 @@ Status: install ok not-installed" | ipkg_status_update_sd $sd $pkg new_pkgs="$new_pkgs $pkg" ### echo "Dependences not satisfied for $pkg: $remaining_deps" if [ $curcheck -ne `echo $pkgs|wc -w` ]; then - continue + continue fi fi@@ -886,7 +886,7 @@ diff -u $dest/$conffile $IPKG_TMP/$pkg/data/$conffile" fi local owd=`pwd` - (cd $IPKG_TMP/$pkg/data/; tar cf - . | (cd $owd; cd $dest; tar xf -)) + (cd $IPKG_TMP/$pkg/data/; tar cf - . | (cd $owd; cd $dest; tar xf -)) rm -rf $IPKG_TMP/$pkg/data rmdir $IPKG_TMP/$pkg rm -f $IPKG_TMP/data.tar.gz $IPKG_TMP/data.tar@@ -924,7 +924,7 @@ ipkg_install() { while [ $# -gt 0 ]; do local pkg="$1" shift - + case "$pkg" in http://* | ftp://*) local tmp_pkg_file="$IPKG_TMP/"`ipkg_file_part $pkg`@@ -1013,7 +1013,7 @@ ipkg_upgrade_pkg() { return 0 fi - if [ "$avail_ver" = "$inst_ver" ]; then + if [ "$avail_ver" = "$inst_ver" ]; then echo "Package $pkg ($inst_ver) installed in $dest_name is up to date" elif ipkg-compare-versions $avail_ver '>>' $inst_ver; then echo "Upgrading $pkg ($dest_name) from $inst_ver to $avail_ver"@@ -1037,7 +1037,7 @@ ipkg_upgrade() { else pkgs="$*" fi - + for pkg in $pkgs; do ipkg_upgrade_pkg $pkg donebin/stage-manager-ipkg-build renamed from recipes/stage-manager/files/stage-manager-ipkg-build +3
-3@@ -68,7 +68,7 @@ You probably want to chown these to a system user: ">&2 ls -ld $large_uid_files echo>&2 fi - + if [ ! -f "$CONTROL/control" ]; then echo "*** Error: Control file $pkg_dir/$CONTROL/control not found.">&2@@ -109,7 +109,7 @@ You probably want to chown these to a system user: ">&2 source=`required_field Source` [ "$?" -ne 0 ]&& PKG_ERROR=1 if [ -z "$source" ]; then - echo "The Source field contain the URL's or filenames of the source code and any patches" + echo "The Source field contain the URL's or filenames of the source code and any patches" echo "used to build this package. Either gnu-style tarballs or Debian source packages " echo "are acceptable. Relative filenames may be used if they are distributed in the same" echo "directory as the .ipk file."@@ -196,7 +196,7 @@ case $# in ;; *) echo $usage>&2 - exit 1 + exit 1 ;; esacclasses/base.bbclass +2
-3@@ -61,8 +61,7 @@ def base_deps(d): # that case though. # deps = "coreutils-native" - if bb.data.getVar('PN', d, True) in ("shasum-native", "stagemanager-native", - "coreutils-native"): + if bb.data.getVar('PN', d, True) in ("shasum-native", "coreutils-native"): deps = "" # INHIBIT_DEFAULT_DEPS doesn't apply to the patch command. Whether or not@@ -76,7 +75,7 @@ def base_deps(d): bb.data.getVar('PN', d, True) not in \ ("linux-libc-headers-native", "quilt-native", "unifdef-native", "shasum-native", - "stagemanager-native", "coreutils-native"): + "coreutils-native"): deps += " linux-libc-headers-native" return depsclasses/packaged-staging.bbclass +0
-5@@ -23,7 +23,6 @@ PSTAGE_SCAN_CMD ?= "find ${PSTAGE_TMPDIR_STAGE} \( -name "*.la" -o -name "*-conf PSTAGE_NATIVEDEPENDS = "\ shasum-native \ - stagemanager-native \ " BB_STAMP_WHITELIST = "${PSTAGE_NATIVEDEPENDS}"@@ -75,10 +74,6 @@ python __anonymous() { # Add task dependencies if we're active, otherwise mark packaged staging # as inactive. if pstage_allowed: - deps = bb.data.getVarFlag('do_setscene', 'depends', d) or "" - deps += " stagemanager-native:do_populate_sysroot" - bb.data.setVarFlag('do_setscene', 'depends', deps, d) - policy = bb.data.getVar("BB_STAMP_POLICY", d, True) if policy == "whitelist" or policy == "full": deps = bb.data.getVarFlag('do_setscene', 'recrdeptask', d) or ""recipes/stage-manager/stagemanager-native_0.0.1.bb deleted +0
-26@@ -1,26 +0,0 @@ -DESCRIPTION = "Helper script for packaged-staging.bbclass" -PR = "r15" - -SRC_URI = "file://stage-manager \ - file://stage-manager-ipkg \ - file://stage-manager-ipkg-build " -LICENSE = "GPLv2" - -PACKAGE_ARCH = "all" - -inherit native - -DEPENDS = " " -PACKAGE_DEPENDS = " " -PATCHDEPENDENCY = "" -INHIBIT_DEFAULT_DEPS = "1" - -PSTAGING_DISABLED = "1" - -NATIVE_INSTALL_WORKS = "1" -do_install() { - install -d ${STAGING_BINDIR} - install -m 0755 ${WORKDIR}/stage-manager ${STAGING_BINDIR} - install -m 0755 ${WORKDIR}/stage-manager-ipkg ${STAGING_BINDIR} - install -m 0755 ${WORKDIR}/stage-manager-ipkg-build ${STAGING_BINDIR} -}
Quoted 3 lines · Chris Larson
From: Chris Larson<[email protected]>
Signed-off-by Chris Larson<[email protected]>
Quoted 54 lines
--- bin/{ => darwin}/cp | 0 bin/{ => darwin}/sed | 0 conf/bitbake.conf | 5 +++-- conf/build/Power Macintosh-darwin.conf | 2 +- conf/build/i386-darwin.conf | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-)rename bin/{ => darwin}/cp (100%)
rename bin/{ => darwin}/sed (100%)bin/darwin/cp renamed from bin/cp +0
-0bin/darwin/sed renamed from bin/sed +0
-0conf/bitbake.conf +3
-2@@ -421,8 +421,9 @@ EXTRA_IMAGEDEPENDS = "" LIBTOOL_HAS_SYSROOT ?= "no" -PATH_prepend = "${STAGING_BINDIR_CROSS}:${STAGING_DIR_NATIVE}${sbindir_native}:${STAGING_BINDIR_NATIVE}:${STAGING_DIR_NATIVE}${base_sbindir_native}:${STAGING_DIR_NATIVE}/${base_bindir_native}:" -export PATH +BBPATH_BIN = "${@':'.join('%s/bin' % path for path in '${BBPATH}'.split(':'))}" +PATH =. "${BBPATH_BIN}:${STAGING_BINDIR_CROSS}:${STAGING_DIR_NATIVE}${sbindir_native}:${STAGING_BINDIR_NATIVE}:${STAGING_DIR_NATIVE}${base_sbindir_native}:${STAGING_DIR_NATIVE}/${base_bindir_native}:" +PATH[export] = "1" ################################################################## # Build utility info.conf/build/Power Macintosh-darwin.conf +1
-1@@ -1,4 +1,4 @@ -PATH =. "${@bb.which('${BBPATH}', 'bin')}:" +PATH =. "${@bb.which('${BBPATH}', 'bin')}/darwin:" BUILD_ARCH = "powerpc" require conf/build/darwin/utilities.incconf/build/i386-darwin.conf +1
-1@@ -1,4 +1,4 @@ -PATH =. "${@bb.which('${BBPATH}', 'bin')}:" +PATH =. "${@bb.which('${BBPATH}', 'bin')}/darwin:" BUILD_CC_ARCH += "-m32" require conf/build/darwin/utilities.inc
Re: [PATCH 3/4] Add install wrapper rather than coreutils-native
In reply to Chris LarsonQuoted 3 lines · Chris Larson
From: Chris Larson<[email protected]>
Signed-off-by Chris Larson<[email protected]>
Quoted 158 lines
--- bin/darwin/cp | 2 +- bin/darwin/sed | 2 +- bin/install | 28 ++++++++++++++++++++++++++++ classes/base.bbclass | 28 +++++++++------------------- classes/gpe.bbclass | 2 +- classes/gpephone.bbclass | 2 +- recipes/twin/twin_0.4.6.bb | 1 - 7 files changed, 41 insertions(+), 24 deletions(-)create mode 100755 bin/install
bin/darwin/cp +1
-1@@ -7,7 +7,7 @@ # - Otherwise, we stick to what SuSv3 defines -source $(dirname $0)/wrapper.sh +source $(dirname $0)/../wrapper.sh saved="" while getopts fpaRHLP opt; dobin/darwin/sed +1
-1@@ -21,7 +21,7 @@ # to reimplement -i internally in this script on some platforms. -source $(dirname $0)/wrapper.sh +source $(dirname $0)/../wrapper.sh case `uname -s` in Darwin)bin/install new file +28
-0@@ -0,0 +1,28 @@ +#!/bin/sh + +source $(dirname $0)/wrapper.sh + +saved="" +while getopts dbCcMpSsvB:f:g:m:o: opt; do + case "$opt" in + s) + # Ignore strip argument + ;; + B|f|g|m|o) + save "-$opt" + save "$OPTARG" + ;; + \?) + exit 1 + ;; + *) + save "-$opt" + ;; + esac +done +shift $(($OPTIND - 1)) +for arg; do + save "$arg" +done + +exec_realclasses/base.bbclass +9
-19@@ -55,33 +55,23 @@ oe_runmake() { } def base_deps(d): - # - # Ideally this will check a flag so we will operate properly in - # the case where host == build == target, for now we don't work in - # that case though. - # - deps = "coreutils-native" - if bb.data.getVar('PN', d, True) in ("shasum-native", "coreutils-native"): - deps = "" - # INHIBIT_DEFAULT_DEPS doesn't apply to the patch command. Whether or not # we need that built is the responsibility of the patch function / class, not # the application. if not bb.data.getVar('INHIBIT_DEFAULT_DEPS', d): if (bb.data.getVar('HOST_SYS', d, 1) != - bb.data.getVar('BUILD_SYS', d, 1)): - deps += " virtual/${TARGET_PREFIX}gcc virtual/libc " + bb.data.getVar('BUILD_SYS', d, 1)): + return "virtual/${TARGET_PREFIX}gcc virtual/libc" elif bb.data.inherits_class('native', d) and \ bb.data.getVar('PN', d, True) not in \ ("linux-libc-headers-native", "quilt-native", - "unifdef-native", "shasum-native", - "coreutils-native"): - deps += " linux-libc-headers-native" - return deps + "unifdef-native", "shasum-native"): + return "linux-libc-headers-native" + return "" -DEPENDS_prepend="${@base_deps(d)} " -DEPENDS_virtclass-native_prepend="${@base_deps(d)} " -DEPENDS_virtclass-nativesdk_prepend="${@base_deps(d)} " +DEPENDS_prepend = "${@base_deps(d)} " +DEPENDS_virtclass-native_prepend = "${@base_deps(d)} " +DEPENDS_virtclass-nativesdk_prepend = "${@base_deps(d)} " SCENEFUNCS += "base_scenefunction"@@ -89,7 +79,7 @@ SCENEFUNCS += "base_scenefunction" python base_scenefunction () { stamp = bb.data.getVar('STAMP', d, 1) + ".needclean" if os.path.exists(stamp): - bb.build.exec_func("do_clean", d) + bb.build.exec_func("do_clean", d) } python base_do_setscene () {classes/gpe.bbclass +1
-1@@ -1,4 +1,4 @@ -DEPENDS_prepend = "coreutils-native virtual/libintl intltool-native " +DEPENDS_prepend = "virtual/libintl intltool-native " GPE_TARBALL_SUFFIX ?= "gz" SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.${GPE_TARBALL_SUFFIX}" FILES_${PN} += "${datadir}/gpe ${datadir}/application-registry"classes/gpephone.bbclass +1
-1@@ -1,4 +1,4 @@ -DEPENDS_prepend = "coreutils-native virtual/libintl intltool-native " +DEPENDS_prepend = "virtual/libintl intltool-native " GPE_TARBALL_SUFFIX ?= "gz" SRC_URI = "${GPEPHONE_MIRROR}/${PN}-${PV}/${PN}-${PV}.tar.${GPE_TARBALL_SUFFIX}" FILES_${PN} += "${datadir}/gpe ${datadir}/application-registry"recipes/twin/twin_0.4.6.bb +0
-1@@ -1,7 +1,6 @@ DESCRIPTION = "Twin is a text-mode windowing environment: it draws and manages text windows on a text-mode display, like X11 does for graphical windows. It has a built-in window manager and terminal emulator, and can be used as server for remote clients in the same style as X11. It can display on Linux console, on X11 and inside itself." SECTION = "console/utils" -DEPENDS = "coreutils-native" LICENSE = "GPL LGPL" SRC_URI = "http://linuz.sns.it/~max/twin/twin-0.4.6.tar.gz \ file://cross_compile.patch"
Re: [PATCH 4/4] bin/install: implement -D internally
In reply to Chris LarsonQuoted 3 lines · Chris Larson
From: Chris Larson<[email protected]>
Signed-off-by Chris Larson<[email protected]>
Quoted 42 lines
--- bin/install | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-)bin/install +12
-1@@ -1,9 +1,13 @@ #!/bin/sh +# +# Portability notes: +# - We allow what SuSv3 defines +# - We implement -D internally source $(dirname $0)/wrapper.sh saved="" -while getopts dbCcMpSsvB:f:g:m:o: opt; do +while getopts dbCcMpSsvB:f:g:m:o:D opt; do case "$opt" in s) # Ignore strip argument@@ -12,6 +16,9 @@ while getopts dbCcMpSsvB:f:g:m:o: opt; do save "-$opt" save "$OPTARG" ;; + D) + createleading="1" + ;; \?) exit 1 ;;@@ -25,4 +32,8 @@ for arg; do save "$arg" done +if [ $# == 2 -a -n "$createleading" ]; then + install -d $(dirname $2) +fi + exec_real
Re: [PATCH 4/4] bin/install: implement -D internally
In reply to Chris LarsonQuoted 12 lines · Chris Larson
From: Chris Larson <[email protected]>
Signed-off-by Chris Larson <[email protected]>---
bin/install | 13 ++++++++++++-1 files changed, 12 insertions(+), 1 deletions(-)bin/install +0
-0
bin/install line 4
Quoted 4 lines
bin/install +3
-0@@ -1,9 +1,13 @@ #!/bin/sh +# +# Portability notes: +# - We allow what SuSv3 defines
erm, SuSv3 is superseded by SUSv4 for quite some time now. And i wasn't aware that SUS specified install(1) (please show me where, i don't see it).
Without the comment above:
Quoted 29 lines
bin/install +1
-0+# - We implement -D internallysource $(dirname $0)/wrapper.sh
saved=""
bin/install +4
-1-while getopts dbCcMpSsvB:f:g:m:o: opt; do +while getopts dbCcMpSsvB:f:g:m:o:D opt; do case "$opt" in s) # Ignore strip argument@@ -12,6 +16,9 @@ while getopts dbCcMpSsvB:f:g:m:o: opt; do save "-$opt" save "$OPTARG" ;; + D) + createleading="1" + ;; \?) exit 1 ;;@@ -25,4 +32,8 @@ for arg; do save "$arg"done
bin/install +4
-0+if [ $# == 2 -a -n "$createleading" ]; then + install -d $(dirname $2) +fi +
exec_real