bffb229 Stop packaging mtrees — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Stop packaging mtrees

Baptiste Daroussin committed 11 years ago

commit bffb22988d1c0a438365a14b91029e0de8373b0d
parent d4b08fd

2 files changed +1 -15

modified libpkg/pkg_create.c

@@ -146,11 +146,6 @@ pkg_create_from_dir(struct pkg *pkg, const char *root,

 		sbuf_delete(b);
 	}
 	pkg_get(pkg, PKG_MTREE, &mtree);
 	if (mtree != NULL)
 		packing_append_buffer(pkg_archive, mtree, "+MTREE_DIRS",
 		    strlen(mtree));
 	while (pkg_files(pkg, &file) == EPKG_OK) {
 		const char *pkg_path = pkg_file_path(file);

@@ -352,11 +347,6 @@ pkg_create_staged(const char *outdir, pkg_formats format, const char *rootdir,

 		pkg_set(pkg, PKG_ARCH, arch);
 	}
 	/* if no mtree try to get it from a file */
 	pkg_get(pkg, PKG_MTREE, &buf);
 	if (buf == NULL)
 		pkg_load_from_file(mfd, pkg, PKG_MTREE, "+MTREE_DIRS");
 	for (i = 0; scripts[i] != NULL; i++) {
 		if (faccessat(mfd, scripts[i], F_OK, 0) == 0)
 			pkg_addscript_fileat(mfd, pkg, scripts[i]);

modified src/register.c

@@ -230,7 +230,7 @@ exec_register(int argc, char **argv)

 	if (mfile != NULL) {
 		ret = pkg_parse_manifest_file(pkg, mfile, keys);
 		pkg_manifest_keys_free(keys);
 		if (ret != EPKG_OK)
 		if (ret != EPKG_OK)
 			return (EX_IOERR);
 	} else {

@@ -248,10 +248,6 @@ exec_register(int argc, char **argv)

 		if (access(fpath, F_OK) == 0)
 			pkg_set_from_file(pkg, PKG_MESSAGE, fpath, false);
 		snprintf(fpath, sizeof(fpath), "%s/+MTREE_DIRS", mdir);
 		if (access(fpath, F_OK) == 0)
 			pkg_set_from_file(pkg, PKG_MTREE, fpath, false);
 		for (i = 0; scripts[i] != NULL; i++) {
 			snprintf(fpath, sizeof(fpath), "%s/%s", mdir,
 			    scripts[i]);