10 files changed, 409 insertions, 0 deletions

diff --git a/meta/recipes-devtools/opkg/opkg-collateral.bb b/meta/recipes-devtools/opkg/opkg-collateral.bb
new file mode 100644
index 0000000000..cacd8800e9
--- /dev/null
+++ b/meta/recipes-devtools/opkg/opkg-collateral.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "opkg configuration files"
+SECTION = "base"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+PR = "r2"
+
+SRC_URI = "file://opkg.conf.comments \
+           file://dest \
+           file://src "
+
+OPKGLIBDIR = "${localstatedir}/lib"
+do_compile () {
+        cat ${WORKDIR}/opkg.conf.comments >${WORKDIR}/opkg.conf
+        cat ${WORKDIR}/src      >>${WORKDIR}/opkg.conf
+        cat ${WORKDIR}/dest     >>${WORKDIR}/opkg.conf
+        echo "lists_dir ext ${OPKGLIBDIR}/opkg" >>${WORKDIR}/opkg.conf
+}
+
+do_install () {
+        install -d ${D}${sysconfdir}/opkg
+        install -m 0644 ${WORKDIR}/opkg.conf ${D}${sysconfdir}/opkg/opkg.conf
+}
+
+CONFFILES_${PN} = "${sysconfdir}/opkg/opkg.conf"
diff --git a/meta/recipes-devtools/opkg/opkg-collateral/dest b/meta/recipes-devtools/opkg/opkg-collateral/dest
new file mode 100644
index 0000000000..088ca403da
--- /dev/null
+++ b/meta/recipes-devtools/opkg/opkg-collateral/dest
@@ -0,0 +1 @@
+dest root /
diff --git a/meta/recipes-devtools/opkg/opkg-collateral/opkg.conf.comments b/meta/recipes-devtools/opkg/opkg-collateral/opkg.conf.comments
new file mode 100644
index 0000000000..e1fdada9b5
--- /dev/null
+++ b/meta/recipes-devtools/opkg/opkg-collateral/opkg.conf.comments
@@ -0,0 +1,26 @@
+# Must have one or more source entries of the form:
+#
+#   src <src-name> <source-url>
+#
+# and one or more destination entries of the form:
+#
+#   dest <dest-name> <target-path>
+#
+# where <src-name> and <dest-names> are identifiers that
+# should match [a-zA-Z0-9._-]+, <source-url> should be a
+# URL that points to a directory containing a Familiar
+# Packages file, and <target-path> should be a directory
+# that exists on the target system.
+
+# Proxy Support
+#option http_proxy http://proxy.tld:3128
+#option ftp_proxy http://proxy.tld:3128
+#option proxy_username <username>
+#option proxy_password <password>
+
+# Enable GPGME signature
+# option check_signature 1
+
+# Offline mode (for use in constructing flash images offline)
+#option offline_root target
+
diff --git a/meta/recipes-devtools/opkg/opkg-collateral/src b/meta/recipes-devtools/opkg/opkg-collateral/src
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/meta/recipes-devtools/opkg/opkg-collateral/src
diff --git a/meta/recipes-devtools/opkg/opkg-config-base_1.0.bb b/meta/recipes-devtools/opkg/opkg-config-base_1.0.bb
new file mode 100644
index 0000000000..f40e981126
--- /dev/null
+++ b/meta/recipes-devtools/opkg/opkg-config-base_1.0.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = "Base configuration files for opkg"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+PR = "r1"
+
+do_compile() {
+        mkdir -p ${S}/${sysconfdir}/opkg/
+
+        archconf=${S}/${sysconfdir}/opkg/arch.conf
+
+        rm -f $archconf
+        ipkgarchs="${ALL_MULTILIB_PACKAGE_ARCHS}"
+        priority=1
+        for arch in $ipkgarchs; do 
+                echo "arch $arch $priority" >> $archconf
+                priority=$(expr $priority + 5)
+        done
+}
+
+
+do_install () {
+        install -d ${D}${sysconfdir}/opkg
+        install -m 0644  ${S}/${sysconfdir}/opkg/* ${D}${sysconfdir}/opkg/
+}
+
+FILES_${PN} = "${sysconfdir}/opkg/ "
+
+CONFFILES_${PN} += "${sysconfdir}/opkg/arch.conf"
+
diff --git a/meta/recipes-devtools/opkg/opkg.inc b/meta/recipes-devtools/opkg/opkg.inc
new file mode 100644
index 0000000000..3d568867d4
--- /dev/null
+++ b/meta/recipes-devtools/opkg/opkg.inc
@@ -0,0 +1,107 @@
+DESCRIPTION = "Open Package Manager"
+DESCRIPTION_libopkg = "Open Package Manager Library"
+DESCRIPTION_update-alternatives-cworth = "Update alternatives"
+SECTION = "base"
+HOMEPAGE = "http://code.google.com/p/opkg/"
+BUGTRACKER = "http://code.google.com/p/opkg/issues/list"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
+                    file://src/opkg-cl.c;beginline=1;endline=20;md5=321f658c3f6b6c832e25c8850b5dffba"
+
+PE = "1"
+INC_PR = "r13"
+
+# Werror gives all kinds bounds issuses with gcc 4.3.3
+do_configure_prepend() {
+        sed -i -e s:-Werror::g ${S}/libopkg/Makefile.am
+}
+
+inherit autotools pkgconfig systemd
+
+python () {
+    if 'sysvinit' not in d.getVar("DISTRO_FEATURES", True).split():
+        pn = d.getVar('PN', True)
+        d.setVar('SYSTEMD_SERVICE_%s' % (pn), 'opkg-configure.service')
+}
+
+target_localstatedir := "${localstatedir}"
+OPKGLIBDIR = "${target_localstatedir}/lib"
+
+SHARED_EXTRA_OECONF = "\
+  --with-opkglibdir=${OPKGLIBDIR} \
+  --disable-gpg \
+  --disable-curl \
+  --disable-openssl \
+"
+EXTRA_OECONF_class-target = "${SHARED_EXTRA_OECONF} --disable-ssl-curl --disable-sha256"
+EXTRA_OECONF_class-native = "${SHARED_EXTRA_OECONF}"
+EXTRA_OECONF_class-nativesdk = "${SHARED_EXTRA_OECONF}"
+
+PROVIDES += "virtual/update-alternatives"
+RPROVIDES_update-alternatives-cworth += "update-alternatives"
+RCONFLICTS_update-alternatives-cworth = "update-alternatives-dpkg"
+RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} opkg-config-base"
+RDEPENDS_${PN}_class-native = ""
+RDEPENDS_${PN}_class-nativesdk = ""
+RREPLACES_${PN} = "opkg-nogpg"
+
+PACKAGES =+ "libopkg-dev libopkg-staticdev libopkg update-alternatives-cworth"
+
+FILES_update-alternatives-cworth = "${bindir}/update-alternatives"
+FILES_libopkg-dev = "${libdir}/*.la ${libdir}/*.so ${includedir}/libopkg"
+FILES_libopkg-staticdev = "${libdir}/*.a"
+FILES_libopkg = "${libdir}/*.so.* ${OPKGLIBDIR}/opkg/"
+
+do_install_append() {
+        # We need to create the lock directory
+        install -d ${D}${OPKGLIBDIR}/opkg
+
+        if ${@base_contains('DISTRO_FEATURES','sysvinit','false','true',d)};then
+                install -d ${D}${systemd_unitdir}/system
+                install -m 0644 ${WORKDIR}/opkg-configure.service ${D}${systemd_unitdir}/system/
+                sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
+                        -e 's,@SYSCONFDIR@,${sysconfdir},g' \
+                        -e 's,@BINDIR@,${bindir},g' \
+                        -e 's,@SYSTEMD_UNITDIR@,${systemd_unitdir},g' \
+                        ${D}${systemd_unitdir}/system/opkg-configure.service
+        fi
+}
+
+do_install_append_class-native() {
+        if [ "${PREFERRED_PROVIDER_virtual/update-alternatives-native}" != "${PN}" ]; then
+                rm ${D}${bindir}/update-alternatives
+        fi
+}
+
+pkg_postinst_${PN} () {
+#!/bin/sh
+if ${@base_contains('DISTRO_FEATURES','sysvinit','true','false',d)} && \
+        [ "x$D" != "x" ] && [ -f $D${OPKGLIBDIR}/opkg/status ]; then
+        install -d $D${sysconfdir}/rcS.d
+
+        # this happens at S98 where our good 'ole packages script used to run
+        echo "#!/bin/sh
+[ -e ${sysconfdir}/default/postinst ] && . ${sysconfdir}/default/postinst
+if [ \"\$POSTINST_LOGGING\" = \"1\" ]; then
+    opkg-cl configure >\$LOGFILE 2>&1
+else
+    opkg-cl configure
+fi
+rm -f ${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts
+" > $D${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts
+        chmod 0755 $D${sysconfdir}/rcS.d/S${POSTINSTALL_INITPOSITION}run-postinsts
+fi
+}
+
+inherit update-alternatives
+
+ALTERNATIVE_PRIORITY = "100"
+ALTERNATIVE_${PN} = "opkg"
+ALTERNATIVE_LINK_NAME[opkg] = "${bindir}/opkg"
+ALTERNATIVE_TARGET[opkg] = "${bindir}/opkg-cl"
+
+BBCLASSEXTEND = "native nativesdk"
+
+# Define a variable to allow distros to run configure earlier.
+# (for example, to enable loading of ethernet kernel modules before networking starts)
+POSTINSTALL_INITPOSITION ?= "98"
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..8489058b9e
--- /dev/null
+++ b/meta/recipes-devtools/opkg/opkg/add-exclude.patch
@@ -0,0 +1,112 @@
+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 <mark.hatle@windriver.com>
+Signed-off-by: Jonathan Liu <net147@gmail.com>
+
+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,17 @@ 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;
++                       }
+                case ARGS_OPT_NOACTION:
+                        conf->noaction = 1;
+                        break;
+@@ -282,6 +295,7 @@ usage()
+        printf("\t--offline-root <dir>  offline installation of packages.\n");
+        printf("\t--add-arch <arch>:<prio>      Register architecture with given priority\n");
+        printf("\t--add-dest <name>:<path>      Register destination with given path\n");
++       printf("\t--add-exclude <name>          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 <mark.hatle@windriver.com>
+
+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 <ctype.h>
+ 
+ #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
diff --git a/meta/recipes-devtools/opkg/opkg_svn.bb b/meta/recipes-devtools/opkg/opkg_svn.bb
new file mode 100644
index 0000000000..cd0485fe38
--- /dev/null
+++ b/meta/recipes-devtools/opkg/opkg_svn.bb
@@ -0,0 +1,14 @@
+require opkg.inc
+
+SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;protocol=http \
+           file://no-install-recommends.patch \
+           file://add-exclude.patch \
+           file://opkg-configure.service \
+"
+
+S = "${WORKDIR}/trunk"
+
+SRCREV = "653"
+PV = "0.1.8+svnr${SRCPV}"
+
+PR = "${INC_PR}.0"