From c527fd1f14c27855a37f2e8ac5346ce8d940ced2 Mon Sep 17 00:00:00 2001 From: Tudor Florea Date: Thu, 16 Oct 2014 03:05:19 +0200 Subject: initial commit for Enea Linux 4.0-140929 Migrated from the internal git server on the daisy-enea-point-release branch Signed-off-by: Tudor Florea --- meta/recipes-devtools/opkg/opkg/add-exclude.patch | 113 +++++++++++++++++++++ .../opkg/opkg/no-install-recommends.patch | 78 ++++++++++++++ .../opkg/opkg/opkg-configure.service | 17 ++++ 3 files changed, 208 insertions(+) create mode 100644 meta/recipes-devtools/opkg/opkg/add-exclude.patch create mode 100644 meta/recipes-devtools/opkg/opkg/no-install-recommends.patch create mode 100644 meta/recipes-devtools/opkg/opkg/opkg-configure.service (limited to 'meta/recipes-devtools/opkg/opkg') diff --git a/meta/recipes-devtools/opkg/opkg/add-exclude.patch b/meta/recipes-devtools/opkg/opkg/add-exclude.patch new file mode 100644 index 0000000000..8d328d5b86 --- /dev/null +++ b/meta/recipes-devtools/opkg/opkg/add-exclude.patch @@ -0,0 +1,113 @@ +Add a way to exclude specific packages from the install + +When an excluded package is required by another package an error +will be generated. If the excluded package is only recommended, +no error will be generated. + +The lifespan of the exclude_list covers the execution of the process, +so there is no need to free the data. + +Upstream-Status: Pending + +Signed-off-by: Mark Hatle +Signed-off-by: Jonathan Liu + +Index: trunk/libopkg/opkg_conf.c +=================================================================== +--- trunk.orig/libopkg/opkg_conf.c ++++ trunk/libopkg/opkg_conf.c +@@ -442,6 +442,7 @@ opkg_conf_init(void) + pkg_dest_list_init(&conf->pkg_dest_list); + pkg_dest_list_init(&conf->tmp_dest_list); + nv_pair_list_init(&conf->arch_list); ++ conf->exclude_list = NULL; + + return 0; + } +Index: trunk/libopkg/opkg_conf.h +=================================================================== +--- trunk.orig/libopkg/opkg_conf.h ++++ trunk/libopkg/opkg_conf.h +@@ -49,6 +49,8 @@ struct opkg_conf + pkg_dest_list_t pkg_dest_list; + pkg_dest_list_t tmp_dest_list; + nv_pair_list_t arch_list; ++ size_t exclude_count; ++ char ** exclude_list; + + int restrict_to_default_dest; + pkg_dest_t *default_dest; +Index: trunk/libopkg/pkg_depends.c +=================================================================== +--- trunk.orig/libopkg/pkg_depends.c ++++ trunk/libopkg/pkg_depends.c +@@ -212,6 +212,22 @@ pkg_hash_fetch_unsatisfied_dependencies( + continue; + } + ++ /* Check for excluded packages */ ++ if (satisfying_pkg != NULL && conf->exclude_list) { ++ int i, exclude = 0; ++ for (i = 0; i < conf->exclude_count; i++) { ++ if (!strcmp(satisfying_pkg->name, conf->exclude_list[i])) { ++ opkg_msg(NOTICE, "%s: exclude required package %s" ++ "at users request\n", ++ pkg->name, satisfying_pkg->name); ++ exclude = 1; ++ break; ++ } ++ } ++ if (exclude) ++ continue; ++ } ++ + opkg_msg(DEBUG, "satisfying_pkg=%p\n", satisfying_pkg); + if (satisfying_pkg != NULL) { + satisfier_entry_pkg = satisfying_pkg; +Index: trunk/src/opkg-cl.c +=================================================================== +--- trunk.orig/src/opkg-cl.c ++++ trunk/src/opkg-cl.c +@@ -45,6 +45,7 @@ enum { + ARGS_OPT_PREFER_ARCH_TO_VERSION, + ARGS_OPT_ADD_ARCH, + ARGS_OPT_ADD_DEST, ++ ARGS_OPT_ADD_EXCLUDE, + ARGS_OPT_NOACTION, + ARGS_OPT_DOWNLOAD_ONLY, + ARGS_OPT_NODEPS, +@@ -95,6 +96,7 @@ static struct option long_options[] = { + {"offline-root", 1, 0, 'o'}, + {"add-arch", 1, 0, ARGS_OPT_ADD_ARCH}, + {"add-dest", 1, 0, ARGS_OPT_ADD_DEST}, ++ {"add-exclude", 1, 0, ARGS_OPT_ADD_EXCLUDE}, + {"test", 0, 0, ARGS_OPT_NOACTION}, + {"tmp-dir", 1, 0, 't'}, + {"tmp_dir", 1, 0, 't'}, +@@ -198,6 +200,18 @@ args_parse(int argc, char *argv[]) + } + free(tuple); + break; ++ case ARGS_OPT_ADD_EXCLUDE: ++ tuple = xstrdup(optarg); ++ if (!conf->exclude_list) { ++ conf->exclude_count = 1; ++ conf->exclude_list = malloc(sizeof(char *) * conf->exclude_count); ++ conf->exclude_list[conf->exclude_count - 1] = tuple; ++ } else { ++ conf->exclude_count++; ++ conf->exclude_list = realloc(conf->exclude_list, sizeof(char *) * conf->exclude_count); ++ conf->exclude_list[conf->exclude_count - 1] = tuple; ++ } ++ break; + case ARGS_OPT_NOACTION: + conf->noaction = 1; + break; +@@ -282,6 +296,7 @@ usage() + printf("\t--offline-root offline installation of packages.\n"); + printf("\t--add-arch : Register architecture with given priority\n"); + printf("\t--add-dest : Register destination with given path\n"); ++ printf("\t--add-exclude Register package to be excluded from install\n"); + printf("\t--prefer-arch-to-version\t Use the architecture priority package rather\n"); + printf("\t than the higher version one if more\n"); + printf("\t than one candidate is found.\n"); diff --git a/meta/recipes-devtools/opkg/opkg/no-install-recommends.patch b/meta/recipes-devtools/opkg/opkg/no-install-recommends.patch new file mode 100644 index 0000000000..6d1ccecbf4 --- /dev/null +++ b/meta/recipes-devtools/opkg/opkg/no-install-recommends.patch @@ -0,0 +1,78 @@ +Add the ability to not install ANY recommended packages. + +Upstream-Status: Pending + +Signed-off-by: Mark Hatle + +Index: trunk/libopkg/opkg_conf.h +=================================================================== +--- trunk.orig/libopkg/opkg_conf.h ++++ trunk/libopkg/opkg_conf.h +@@ -80,6 +80,7 @@ struct opkg_conf + int prefer_arch_to_version; + int check_signature; + int nodeps; /* do not follow dependencies */ ++ int noinstall_recommends; + char *offline_root; + char *overlay_root; + int query_all; +Index: trunk/libopkg/pkg_depends.c +=================================================================== +--- trunk.orig/libopkg/pkg_depends.c ++++ trunk/libopkg/pkg_depends.c +@@ -19,6 +19,7 @@ + #include + + #include "pkg.h" ++#include "opkg_conf.h" + #include "opkg_utils.h" + #include "pkg_hash.h" + #include "opkg_message.h" +@@ -204,7 +205,7 @@ pkg_hash_fetch_unsatisfied_dependencies( + /* user request overrides package recommendation */ + if (satisfying_pkg != NULL + && (compound_depend->type == RECOMMEND || compound_depend->type == SUGGEST) +- && (satisfying_pkg->state_want == SW_DEINSTALL || satisfying_pkg->state_want == SW_PURGE)) { ++ && (satisfying_pkg->state_want == SW_DEINSTALL || satisfying_pkg->state_want == SW_PURGE || conf->noinstall_recommends)) { + opkg_msg(NOTICE, "%s: ignoring recommendation for " + "%s at user request\n", + pkg->name, satisfying_pkg->name); +Index: trunk/src/opkg-cl.c +=================================================================== +--- trunk.orig/src/opkg-cl.c ++++ trunk/src/opkg-cl.c +@@ -50,6 +50,7 @@ enum { + ARGS_OPT_NODEPS, + ARGS_OPT_AUTOREMOVE, + ARGS_OPT_CACHE, ++ ARGS_OPT_NOINSTALL_RECOMMENDS, + }; + + static struct option long_options[] = { +@@ -89,6 +90,7 @@ static struct option long_options[] = { + {"noaction", 0, 0, ARGS_OPT_NOACTION}, + {"download-only", 0, 0, ARGS_OPT_DOWNLOAD_ONLY}, + {"nodeps", 0, 0, ARGS_OPT_NODEPS}, ++ {"no-install-recommends", 0, 0, ARGS_OPT_NOINSTALL_RECOMMENDS}, + {"offline", 1, 0, 'o'}, + {"offline-root", 1, 0, 'o'}, + {"add-arch", 1, 0, ARGS_OPT_ADD_ARCH}, +@@ -199,6 +201,9 @@ args_parse(int argc, char *argv[]) + case ARGS_OPT_NOACTION: + conf->noaction = 1; + break; ++ case ARGS_OPT_NOINSTALL_RECOMMENDS: ++ conf->noinstall_recommends = 1; ++ break; + case ARGS_OPT_DOWNLOAD_ONLY: + conf->download_only = 1; + break; +@@ -293,6 +298,8 @@ usage() + printf("\t--noaction No action -- test only\n"); + printf("\t--download-only No action -- download only\n"); + printf("\t--nodeps Do not follow dependencies\n"); ++ printf("\t--no-install-recommends\n"); ++ printf("\t Do not install any recommended packages\n"); + printf("\t--force-removal-of-dependent-packages\n"); + printf("\t Remove package and all dependencies\n"); + printf("\t--autoremove Remove packages that were installed\n"); diff --git a/meta/recipes-devtools/opkg/opkg/opkg-configure.service b/meta/recipes-devtools/opkg/opkg/opkg-configure.service new file mode 100644 index 0000000000..b18295b45e --- /dev/null +++ b/meta/recipes-devtools/opkg/opkg/opkg-configure.service @@ -0,0 +1,17 @@ +[Unit] +Description=Opkg first boot configure +DefaultDependencies=no +After=systemd-remount-fs.service systemd-tmpfiles-setup.service tmp.mount +Before=sysinit.target + +[Service] +Type=oneshot +EnvironmentFile=-@SYSCONFDIR@/default/postinst +ExecStart=-@BASE_BINDIR@/sh -c " if [ $POSTINST_LOGGING = '1' ]; then @BINDIR@/opkg-cl configure > $LOGFILE 2>&1; else @BINDIR@/opkg-cl configure; fi" +ExecStartPost=@BASE_BINDIR@/systemctl disable opkg-configure.service +StandardOutput=syslog +RemainAfterExit=No + +[Install] +WantedBy=basic.target +WantedBy=sysinit.target -- cgit v1.2.3-54-g00ecf