summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimo Teras <timo.teras@iki.fi>2009-07-24 14:06:03 +0300
committerTimo Teras <timo.teras@iki.fi>2009-07-24 14:06:03 +0300
commit8e66768cd2bbc39c79875971dd82289fd7be7130 (patch)
tree66d6d109b68d8184ac490b5c28a3dd5090631b00
parente1b489c8b5d8908b45ed15436423a9727b1b44cc (diff)
downloadapk-tools-8e66768cd2bbc39c79875971dd82289fd7be7130.tar.bz2
apk-tools-8e66768cd2bbc39c79875971dd82289fd7be7130.tar.xz
pkg: remove implicit bb dependency when install script is present
this dependency is now inserted automatically by abuild.
-rw-r--r--src/package.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/src/package.c b/src/package.c
index 1d2e50a..bf5b889 100644
--- a/src/package.c
+++ b/src/package.c
@@ -525,7 +525,6 @@ struct read_info_ctx {
struct apk_package *pkg;
struct apk_sign_ctx *sctx;
int version;
- int has_install : 1;
};
int apk_pkg_add_info(struct apk_database *db, struct apk_package *pkg,
@@ -675,9 +674,6 @@ static int read_info_entry(void *ctx, const struct apk_file_info *ae,
break;
}
}
- if (apk_script_type(slash+1) == APK_SCRIPT_POST_INSTALL ||
- apk_script_type(slash+1) == APK_SCRIPT_PRE_INSTALL)
- ri->has_install = 1;
} else if (ri->version < 2) {
/* Version 1.x packages do not contain installed size
* in metadata, so we calculate it here */
@@ -714,7 +710,6 @@ int apk_pkg_read(struct apk_database *db, const char *file,
goto err;
ctx.db = db;
- ctx.has_install = 0;
ctx.pkg->size = fi.size;
tar = apk_bstream_gunzip_mpart(bs, apk_sign_ctx_mpart_cb, sctx);
@@ -728,14 +723,6 @@ int apk_pkg_read(struct apk_database *db, const char *file,
}
if (sctx->action != APK_SIGN_VERIFY)
ctx.pkg->csum = sctx->identity;
-
- /* Add implicit busybox dependency if there is scripts */
- if (ctx.has_install) {
- struct apk_dependency dep = {
- .name = apk_db_get_name(db, APK_BLOB_STR("busybox")),
- };
- apk_deps_add(&ctx.pkg->depends, &dep);
- }
ctx.pkg->filename = strdup(realfile);
ctx.pkg = apk_db_pkg_add(db, ctx.pkg);
@@ -889,7 +876,6 @@ struct apk_package *apk_pkg_parse_index_entry(struct apk_database *db, apk_blob_
ctx.db = db;
ctx.version = 0;
- ctx.has_install = 0;
apk_blob_for_each_segment(blob, "\n", parse_index_line, &ctx);