diff options
author | Mike Westerhof <mwester@dls.net> | 2009-02-28 21:07:02 -0600 |
---|---|---|
committer | Mike Westerhof <mwester@dls.net> | 2009-02-28 21:07:02 -0600 |
commit | 8645ca1e46dca4d9cfa6e7c5e4f510b865721ef0 (patch) | |
tree | c11da41bc90193bafa7a405254be60c12c2a32d9 | |
parent | 24b3cbc8c84797d433f7a37fd6ea454a95df3e84 (diff) | |
download | openembedded-8645ca1e46dca4d9cfa6e7c5e4f510b865721ef0.tar.gz |
SlugOS: opkg-nogpg-nocurl - cherrypick uninitialized err var patch
-rw-r--r-- | packages/opkg/files/opkg_install_err.patch | 17 | ||||
-rw-r--r-- | packages/opkg/opkg-nogpg-nocurl_svn.bb | 3 |
2 files changed, 19 insertions, 1 deletions
diff --git a/packages/opkg/files/opkg_install_err.patch b/packages/opkg/files/opkg_install_err.patch new file mode 100644 index 0000000000..6322abf703 --- /dev/null +++ b/packages/opkg/files/opkg_install_err.patch @@ -0,0 +1,17 @@ +# This is cherry-picked from svn version 199 from the opkg repo. +# +# Commit message: +#Initial the 'err' valaible in opkg_install_by_name , or it may be used without +#initialize. +# +--- orig/libopkg/opkg_install.c 2009-02-13 23:59:17.000000000 -0600 ++++ opkg/libopkg/opkg_install.c 2009-02-28 21:01:59.000000000 -0600 +@@ -139,7 +139,7 @@ int opkg_install_from_file(opkg_conf_t * + + opkg_error_t opkg_install_by_name(opkg_conf_t *conf, const char *pkg_name) + { +- int cmp, err; ++ int cmp, err = 0; + pkg_t *old, *new; + char *old_version, *new_version; + diff --git a/packages/opkg/opkg-nogpg-nocurl_svn.bb b/packages/opkg/opkg-nogpg-nocurl_svn.bb index 6f8b446ead..fe2d09da11 100644 --- a/packages/opkg/opkg-nogpg-nocurl_svn.bb +++ b/packages/opkg/opkg-nogpg-nocurl_svn.bb @@ -10,8 +10,9 @@ SRC_URI += " \ file://opkg_wget_nogpg_02_use_vfork_system.patch;patch=1 \ file://opkg_wget_nogpg_03_fix_tmpdirs.patch;patch=1 \ file://opkg_wget_nogpg_04_default_tmpdir.patch;patch=1 \ + file://opkg_install_err.patch;patch=1;maxrev=198 \ " -PR = "r5" +PR = "r6" SRCREV = "${SRCREV_pn-opkg}" |