diff options
| -rwxr-xr-x | bin/stage-manager (renamed from recipes/stage-manager/files/stage-manager) | 3 | ||||
| -rwxr-xr-x | bin/stage-manager-ipkg (renamed from recipes/stage-manager/files/stage-manager-ipkg) | 26 | ||||
| -rwxr-xr-x | bin/stage-manager-ipkg-build (renamed from recipes/stage-manager/files/stage-manager-ipkg-build) | 6 | ||||
| -rw-r--r-- | classes/base.bbclass | 5 | ||||
| -rw-r--r-- | classes/packaged-staging.bbclass | 5 | ||||
| -rw-r--r-- | recipes/stage-manager/stagemanager-native_0.0.1.bb | 26 |
6 files changed, 18 insertions, 53 deletions
diff --git a/recipes/stage-manager/files/stage-manager b/bin/stage-manager index 0c01a18f94..5b4779121e 100755 --- a/recipes/stage-manager/files/stage-manager +++ b/bin/stage-manager @@ -151,6 +151,3 @@ if __name__ == "__main__": if found_difference: sys.exit(5) sys.exit(0) - - - diff --git a/recipes/stage-manager/files/stage-manager-ipkg b/bin/stage-manager-ipkg index 105ea5458a..456bc78ea9 100755 --- a/recipes/stage-manager/files/stage-manager-ipkg +++ b/bin/stage-manager-ipkg @@ -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 diff --git a/recipes/stage-manager/files/stage-manager-ipkg-build b/bin/stage-manager-ipkg-build index 77367ac35a..1a5e2597ee 100755 --- a/recipes/stage-manager/files/stage-manager-ipkg-build +++ b/bin/stage-manager-ipkg-build @@ -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 diff --git a/classes/base.bbclass b/classes/base.bbclass index 308498f462..6fa292e897 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -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 diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass index e968e4d8f4..19d84bd14e 100644 --- a/classes/packaged-staging.bbclass +++ b/classes/packaged-staging.bbclass @@ -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 "" diff --git a/recipes/stage-manager/stagemanager-native_0.0.1.bb b/recipes/stage-manager/stagemanager-native_0.0.1.bb deleted file mode 100644 index 957774911c..0000000000 --- a/recipes/stage-manager/stagemanager-native_0.0.1.bb +++ /dev/null @@ -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} -} |