aboutsummaryrefslogtreecommitdiffstats
path: root/package/opkg
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2009-11-11 22:13:10 +0000
committerJo-Philipp Wich <jow@openwrt.org>2009-11-11 22:13:10 +0000
commitb0c0b2010b9bb4cefe79bb585a8b0875e5831dd5 (patch)
treea1e29319363e794aa1afedb360fe705c70a74d79 /package/opkg
parent374664f3af27cd893e6b65f83bd12dbdc619769f (diff)
downloadupstream-b0c0b2010b9bb4cefe79bb585a8b0875e5831dd5.tar.gz
upstream-b0c0b2010b9bb4cefe79bb585a8b0875e5831dd5.tar.bz2
upstream-b0c0b2010b9bb4cefe79bb585a8b0875e5831dd5.zip
[package] opkg: forgot to remove two obsolete patches in last commit
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18381 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/opkg')
-rw-r--r--package/opkg/patches/006-fix_force_space.patch12
-rw-r--r--package/opkg/patches/011-fix_nullpointer_deref.patch11
2 files changed, 0 insertions, 23 deletions
diff --git a/package/opkg/patches/006-fix_force_space.patch b/package/opkg/patches/006-fix_force_space.patch
deleted file mode 100644
index 80406ba168..0000000000
--- a/package/opkg/patches/006-fix_force_space.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/libopkg/opkg_conf.c
-+++ b/libopkg/opkg_conf.c
-@@ -252,6 +252,9 @@ int opkg_conf_init(opkg_conf_t *conf, co
- if (args->force_downgrade) {
- conf->force_downgrade = 1;
- }
-+ if (args->force_space) {
-+ conf->force_space = 1;
-+ }
- if (args->force_reinstall) {
- conf->force_reinstall = 1;
- }
diff --git a/package/opkg/patches/011-fix_nullpointer_deref.patch b/package/opkg/patches/011-fix_nullpointer_deref.patch
deleted file mode 100644
index ed198af398..0000000000
--- a/package/opkg/patches/011-fix_nullpointer_deref.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/libopkg/opkg_cmd.c
-+++ b/libopkg/opkg_cmd.c
-@@ -954,7 +954,7 @@
- pkg_to_remove = pkg_hash_fetch_installed_by_name(&conf->pkg_hash, pkg->name );
- }
-
-- if (pkg == NULL) {
-+ if (pkg_to_remove == NULL) {
- opkg_message(conf, OPKG_ERROR, "Package %s is not installed.\n", pkg->name);
- continue;
- }