diff options
| author | hschang <chang@dev3> | 2014-12-09 07:41:10 (GMT) |
|---|---|---|
| committer | hschang <chang@dev3> | 2014-12-12 06:47:21 (GMT) |
| commit | ace0665511bd0f288a33f4aa1b6ab44c9a766c5c (patch) | |
| tree | 73304dd16c718676db621110f8b39b9bd7734816 | |
| parent | 89fe5e2d4ab32d17585aaf80418c7d31ed559a14 (diff) | |
Update openembedded-core / meta-openembedded / bitbake (1.25.0)
- fix bbappend's version.
- Add meta-openembedded/meta-python to BBLAYERS.
- set PACKAGE_ARCH after inherit packagegroup.
- TCLIBC now defines glibc instead of eglibc. eglibc is obsolete. (OE-CORE : 1027c535ea753e63d9ffe469a423e04467cf8940)
- smartmontools : use lastest version from meta-oe.
- swig : use lastest version from meta-oe.
45 files changed, 155 insertions, 641 deletions
@@ -63,6 +63,7 @@ BBLAYERS ?= \ $(CURDIR)/meta-openembedded/meta-networking \ $(CURDIR)/meta-openembedded/meta-multimedia \ $(CURDIR)/meta-openembedded/meta-filesystems \ + $(CURDIR)/meta-openembedded/meta-python \ $(CURDIR)/openembedded-core/meta CONFFILES = \ diff --git a/bitbake b/bitbake -Subproject ef2bf63e56b87e19d1a9059dd2d81a9a1a53725 +Subproject 94d9590a4310f96396e8e782bcf65918f4dcdb3 diff --git a/meta-openembedded b/meta-openembedded -Subproject 6434d97ee958e7f597b9cf358db0275315a33c4 +Subproject 2cc1bd9dd060f5002c2fde7aacba86fe230c12a diff --git a/meta-openvuplus/conf/distro/vuplus.conf b/meta-openvuplus/conf/distro/vuplus.conf index 3d11c66..a9fa2bc 100644 --- a/meta-openvuplus/conf/distro/vuplus.conf +++ b/meta-openvuplus/conf/distro/vuplus.conf @@ -32,8 +32,6 @@ IMAGE_FSTYPES =+ "tar.bz2" # package versions PREFERRED_VERSION_pango ?= "1.28.4" -PREFERRED_VERSION_wpa-supplicant ?= "2.1" - PREFERRED_VERSION_linux-libc-headers ?= "${LINUXLIBCVERSION}" PREFERRED_VERSION_linux-libc-headers-nativesdk ?= "${LINUXLIBCVERSION}" #PREFERRED_VERSION_linux-libc-headers = "3.1" @@ -95,7 +93,6 @@ PR_append_pn-zlib = "-opt1" # Disable installing ldconfig USE_LDCONFIG = "0" -TCLIBC = "eglibc" TCLIBCAPPEND = "" # Drop unused PACKAGE_EXTRA_ARCHS diff --git a/meta-openvuplus/recipes-connectivity/hostapd/hostap-daemon_1.0.bbappend b/meta-openvuplus/recipes-connectivity/hostapd/hostapd_2.%.bbappend index b20dda0..b20dda0 100644 --- a/meta-openvuplus/recipes-connectivity/hostapd/hostap-daemon_1.0.bbappend +++ b/meta-openvuplus/recipes-connectivity/hostapd/hostapd_2.%.bbappend diff --git a/meta-openvuplus/recipes-connectivity/packagegroups/packagegroup-vuplus-wlan.bb b/meta-openvuplus/recipes-connectivity/packagegroups/packagegroup-vuplus-wlan.bb index ecd49df..c1a3450 100644 --- a/meta-openvuplus/recipes-connectivity/packagegroups/packagegroup-vuplus-wlan.bb +++ b/meta-openvuplus/recipes-connectivity/packagegroups/packagegroup-vuplus-wlan.bb @@ -4,6 +4,8 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" PR = "r16" +PACKAGE_ARCH = "${MACHINE_ARCH}" + inherit packagegroup DEPENDS_${PN} = "enigma2" @@ -53,5 +55,3 @@ RDEPENDS_${PN}_append = "\ rt2870sta \ " -PACKAGE_ARCH = "${MACHINE_ARCH}" - diff --git a/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.1/action_wpa.sh b/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant/action_wpa.sh index 6d90fa6..6d90fa6 100644 --- a/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.1/action_wpa.sh +++ b/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant/action_wpa.sh diff --git a/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.1/functions.sh b/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant/functions.sh index b9e0eb2..b9e0eb2 100644 --- a/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.1/functions.sh +++ b/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant/functions.sh diff --git a/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.1/ifupdown.sh b/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant/ifupdown.sh index 9dab925..9dab925 100644 --- a/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.1/ifupdown.sh +++ b/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant/ifupdown.sh diff --git a/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.1/wpa_action b/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_action index 7ef57ac..7ef57ac 100644 --- a/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.1/wpa_action +++ b/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_action diff --git a/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.1/wpa_action.8 b/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_action.8 index e8f1b28..e8f1b28 100644 --- a/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant-2.1/wpa_action.8 +++ b/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_action.8 diff --git a/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.1.bbappend b/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.%.bbappend index 8920c9b..d6fd5b2 100644 --- a/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.1.bbappend +++ b/meta-openvuplus/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.%.bbappend @@ -37,4 +37,4 @@ do_install_append() { ln -s ../../wpa_supplicant/ifupdown.sh ${D}${sysconfdir}/network/if-up.d/${PN} } -FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/meta-openvuplus/recipes-devtools/gdb/gdb_7.7.bbappend b/meta-openvuplus/recipes-devtools/gdb/gdb-cross_7.%.bbappend index bd47852..bd47852 100644 --- a/meta-openvuplus/recipes-devtools/gdb/gdb_7.7.bbappend +++ b/meta-openvuplus/recipes-devtools/gdb/gdb-cross_7.%.bbappend diff --git a/meta-openvuplus/recipes-devtools/gdb/gdb-cross_7.7.bbappend b/meta-openvuplus/recipes-devtools/gdb/gdb_7.%.bbappend index bd47852..bd47852 100644 --- a/meta-openvuplus/recipes-devtools/gdb/gdb-cross_7.7.bbappend +++ b/meta-openvuplus/recipes-devtools/gdb/gdb_7.%.bbappend diff --git a/meta-openvuplus/recipes-devtools/opkg/opkg/0001-pkg_hash_fetch_conflicts-move-iteration-over-conflic.patch b/meta-openvuplus/recipes-devtools/opkg/opkg/0001-pkg_hash_fetch_conflicts-move-iteration-over-conflic.patch new file mode 100644 index 0000000..e2c9ff9 --- /dev/null +++ b/meta-openvuplus/recipes-devtools/opkg/opkg/0001-pkg_hash_fetch_conflicts-move-iteration-over-conflic.patch @@ -0,0 +1,79 @@ +diff --git a/libopkg/pkg_depends.c b/libopkg/pkg_depends.c +index eb630d1..de105bf 100644 +--- a/libopkg/pkg_depends.c ++++ b/libopkg/pkg_depends.c +@@ -377,36 +377,23 @@ is_pkg_a_replaces(pkg_t *pkg_scout,pkg_t *pkg) + } + + +-pkg_vec_t * pkg_hash_fetch_conflicts(pkg_t * pkg) ++static pkg_vec_t * __pkg_hash_fetch_conflicts(pkg_t * pkg, pkg_t * installed_conflicts) + { +- pkg_vec_t * installed_conflicts, * test_vec; ++ pkg_vec_t * test_vec; + compound_depend_t * conflicts; + depend_t ** possible_satisfiers; + depend_t * possible_satisfier; + int i, j, k; + int count; +- abstract_pkg_t * ab_pkg; + pkg_t **pkg_scouts; + pkg_t *pkg_scout; + +- /* +- * this is a setup to check for redundant/cyclic dependency checks, +- * which are marked at the abstract_pkg level +- */ +- if(!(ab_pkg = pkg->parent)){ +- opkg_msg(ERROR, "Internal error: %s not in hash table\n", pkg->name); +- return (pkg_vec_t *)NULL; +- } +- + conflicts = pkg->conflicts; +- if(!conflicts){ +- return (pkg_vec_t *)NULL; +- } +- installed_conflicts = pkg_vec_alloc(); +- +- count = pkg->conflicts_count; + ++ if(!conflicts) ++ return; + ++ count = pkg->conflicts_count; + + /* foreach conflict */ + for(i = 0; i < pkg->conflicts_count; i++){ +@@ -446,10 +433,29 @@ pkg_vec_t * pkg_hash_fetch_conflicts(pkg_t * pkg) + } + conflicts++; + } ++} ++ ++pkg_vec_t * pkg_hash_fetch_conflicts(pkg_t * pkg) ++{ ++ pkg_vec_t * installed_conflicts; ++ abstract_pkg_t * ab_pkg; ++ ++ /* ++ * this is a setup to check for redundant/cyclic dependency checks, ++ * which are marked at the abstract_pkg level ++ */ ++ if(!(ab_pkg = pkg->parent)){ ++ opkg_msg(ERROR, "Internal error: %s not in hash table\n", pkg->name); ++ return (pkg_vec_t *)NULL; ++ } ++ ++ installed_conflicts = pkg_vec_alloc(); ++ ++ __pkg_hash_fetch_conflicts(pkg, installed_conflicts); + +- if (installed_conflicts->len) +- return installed_conflicts; +- pkg_vec_free(installed_conflicts); ++ if (installed_conflicts->len) ++ return installed_conflicts; ++ pkg_vec_free(installed_conflicts); + return (pkg_vec_t *)NULL; + } + diff --git a/meta-openvuplus/recipes-devtools/opkg/opkg/0002-Don-t-mark-Conflicts-as-Depends.patch b/meta-openvuplus/recipes-devtools/opkg/opkg/0002-Don-t-mark-Conflicts-as-Depends.patch deleted file mode 100644 index 9e122de..0000000 --- a/meta-openvuplus/recipes-devtools/opkg/opkg/0002-Don-t-mark-Conflicts-as-Depends.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 8c00c6be3723a0dcf05a10b5aba8c1c3b1fe4cf7 Mon Sep 17 00:00:00 2001 -From: Andreas Oberritter <obi@opendreambox.org> -Date: Wed, 16 May 2012 23:29:04 +0200 -Subject: [PATCH 02/10] Don't mark Conflicts as Depends - -- Fixes 'whatconflicts' sub-command. - -Signed-off-by: Andreas Oberritter <obi@opendreambox.org> ---- - libopkg/pkg_depends.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libopkg/pkg_depends.c b/libopkg/pkg_depends.c -index 1e14d1f..a61e80e 100644 ---- a/libopkg/pkg_depends.c -+++ b/libopkg/pkg_depends.c -@@ -609,8 +609,8 @@ void buildConflicts(pkg_t * pkg) - - conflicts = pkg->conflicts = xcalloc(pkg->conflicts_count, sizeof(compound_depend_t)); - for (i = 0; i < pkg->conflicts_count; i++) { -- conflicts->type = CONFLICTS; - parseDepends(conflicts, pkg->conflicts_str[i]); -+ conflicts->type = CONFLICTS; - free(pkg->conflicts_str[i]); - conflicts++; - } --- -1.7.9.5 - diff --git a/meta-openvuplus/recipes-devtools/opkg/opkg/0002-pkg_hash_fetch_conflicts-take-into-account-conflicts.patch b/meta-openvuplus/recipes-devtools/opkg/opkg/0002-pkg_hash_fetch_conflicts-take-into-account-conflicts.patch new file mode 100644 index 0000000..07e0017 --- /dev/null +++ b/meta-openvuplus/recipes-devtools/opkg/opkg/0002-pkg_hash_fetch_conflicts-take-into-account-conflicts.patch @@ -0,0 +1,35 @@ +diff --git a/libopkg/pkg_depends.c b/libopkg/pkg_depends.c +index de105bf..0089463 100644 +--- a/libopkg/pkg_depends.c ++++ b/libopkg/pkg_depends.c +@@ -435,6 +435,22 @@ static pkg_vec_t * __pkg_hash_fetch_conflicts(pkg_t * pkg, pkg_t * installed_con + } + } + ++static void __pkg_hash_fetch_conflictees(pkg_t *pkg, pkg_vec_t *installed_conflicts) ++{ ++ int i; ++ ++ pkg_vec_t *available_pkgs = pkg_vec_alloc(); ++ pkg_hash_fetch_all_installed(available_pkgs); ++ ++ for (i = 0; i < available_pkgs->len; i++) { ++ pkg_t *cpkg = available_pkgs->pkgs[i]; ++ if (pkg_conflicts(cpkg, pkg) && !is_pkg_in_pkg_vec(installed_conflicts, cpkg)) ++ pkg_vec_insert(installed_conflicts, cpkg); ++ } ++ ++ pkg_vec_free(available_pkgs); ++} ++ + pkg_vec_t * pkg_hash_fetch_conflicts(pkg_t * pkg) + { + pkg_vec_t * installed_conflicts; +@@ -452,6 +468,7 @@ pkg_vec_t * pkg_hash_fetch_conflicts(pkg_t * pkg) + installed_conflicts = pkg_vec_alloc(); + + __pkg_hash_fetch_conflicts(pkg, installed_conflicts); ++ __pkg_hash_fetch_conflictees(pkg, installed_conflicts); + + if (installed_conflicts->len) + return installed_conflicts; diff --git a/meta-openvuplus/recipes-devtools/opkg/opkg/0003-Statically-link-libopkg-and-libbb.patch b/meta-openvuplus/recipes-devtools/opkg/opkg/0003-Statically-link-libopkg-and-libbb.patch deleted file mode 100644 index cfb7268..0000000 --- a/meta-openvuplus/recipes-devtools/opkg/opkg/0003-Statically-link-libopkg-and-libbb.patch +++ /dev/null @@ -1,107 +0,0 @@ -From 698fdfccb2b2855fbe73ecad159b7987b49ddded Mon Sep 17 00:00:00 2001 -From: Andreas Oberritter <obi@opendreambox.org> -Date: Thu, 17 May 2012 01:23:43 +0200 -Subject: [PATCH 03/10] Statically link libopkg and libbb - -* Based on https://dev.openwrt.org/browser/trunk/package/opkg/patches/007-force_static.patch - -Signed-off-by: Andreas Oberritter <obi@opendreambox.org> ---- - libbb/Makefile.am | 8 ++++---- - libopkg/Makefile.am | 14 +++----------- - src/Makefile.am | 4 ++-- - tests/Makefile.am | 6 +++--- - 4 files changed, 12 insertions(+), 20 deletions(-) - -diff --git a/libbb/Makefile.am b/libbb/Makefile.am -index 1cc82df..337d94f 100644 ---- a/libbb/Makefile.am -+++ b/libbb/Makefile.am -@@ -2,9 +2,9 @@ HOST_CPU=@host_cpu@ - BUILD_CPU=@build_cpu@ - ALL_CFLAGS=-g -O -Wall -DHOST_CPU_STR=\"@host_cpu@\" -DBUILD_CPU=@build_cpu@ - --noinst_LTLIBRARIES = libbb.la -+noinst_LIBRARIES = libbb.a - --libbb_la_SOURCES = gz_open.c \ -+libbb_a_SOURCES = gz_open.c \ - libbb.h \ - unzip.c \ - wfopen.c \ -@@ -22,5 +22,5 @@ libbb_la_SOURCES = gz_open.c \ - all_read.c \ - mode_string.c - --libbb_la_CFLAGS = $(ALL_CFLAGS) --#libbb_la_LDFLAGS = -static -+libbb_a_CFLAGS = $(ALL_CFLAGS) -+#libbb_a_LDFLAGS = -static -diff --git a/libopkg/Makefile.am b/libopkg/Makefile.am -index 043c5c4..5882595 100644 ---- a/libopkg/Makefile.am -+++ b/libopkg/Makefile.am -@@ -38,18 +38,10 @@ if HAVE_SHA256 - opkg_util_sources += sha256.c sha256.h - endif - --lib_LTLIBRARIES = libopkg.la --libopkg_la_SOURCES = \ -+noinst_LIBRARIES = libopkg.a -+libopkg_a_SOURCES = \ - $(opkg_libcore_sources) \ - $(opkg_cmd_sources) $(opkg_db_sources) \ - $(opkg_util_sources) $(opkg_list_sources) - --libopkg_la_LIBADD = $(top_builddir)/libbb/libbb.la $(CURL_LIBS) $(GPGME_LIBS) $(OPENSSL_LIBS) $(PATHFINDER_LIBS) -- --libopkg_la_LDFLAGS = -version-info 1:0:0 -- --# make sure we only export symbols that are for public use --#libopkg_la_LDFLAGS = -export-symbols-regex "^opkg_.*" -- -- -- -+libopkg_a_LIBADD = $(top_builddir)/libbb/libbb.a $(CURL_LIBS) $(GPGME_LIBS) $(OPENSSL_LIBS) $(PATHFINDER_LIBS) -diff --git a/src/Makefile.am b/src/Makefile.am -index efdc19d..bb7a792 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -2,5 +2,5 @@ AM_CFLAGS = -I${top_srcdir}/libopkg ${ALL_CFLAGS} - bin_PROGRAMS = opkg-cl - - opkg_cl_SOURCES = opkg-cl.c --opkg_cl_LDADD = $(top_builddir)/libopkg/libopkg.la \ -- $(top_builddir)/libbb/libbb.la -+opkg_cl_LDADD = $(top_builddir)/libopkg/libopkg.a \ -+ $(top_builddir)/libbb/libbb.a -diff --git a/tests/Makefile.am b/tests/Makefile.am -index 1a6f565..132c792 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -4,11 +4,11 @@ AM_CFLAGS = $(ALL_CFLAGS) -Wall -g -O3 -I${top_srcdir}/libopkg - #noinst_PROGRAMS = libopkg_test opkg_active_list_test - noinst_PROGRAMS = libopkg_test - --#opkg_hash_test_LDADD = $(top_builddir)/libbb/libbb.la $(top_builddir)/libopkg/libopkg.la -+#opkg_hash_test_LDADD = $(top_builddir)/libbb/libbb.a $(top_builddir)/libopkg/libopkg.a - #opkg_hash_test_SOURCES = opkg_hash_test.c - #opkg_hash_test_CFLAGS = $(ALL_CFLAGS) -I$(top_srcdir) - --#opkg_extract_test_LDADD = $(top_builddir)/libbb/libbb.la $(top_builddir)/libopkg/libopkg.la -+#opkg_extract_test_LDADD = $(top_builddir)/libbb/libbb.a $(top_builddir)/libopkg/libopkg.a - #opkg_extract_test_SOURCES = opkg_extract_test.c - #opkg_extract_test_CFLAGS = $(ALL_CFLAGS) -I$(top_srcdir) - -@@ -16,7 +16,7 @@ noinst_PROGRAMS = libopkg_test - #opkg_active_list_test_SOURCES = opkg_active_list_test.c - #opkg_active_list_test_CFLAGS = $(ALL_CFLAGS) -I$(top_srcdir) - --libopkg_test_LDADD = $(top_builddir)/libopkg/libopkg.la -+libopkg_test_LDADD = $(top_builddir)/libopkg/libopkg.a $(top_builddir)/libbb/libbb.a - libopkg_test_SOURCE = libopkg_test.c - libopkg_test_LDFLAGS = -static - --- -1.7.9.5 - diff --git a/meta-openvuplus/recipes-devtools/opkg/opkg/0003-opkg_remove-auto-delete-.pyo-files.patch b/meta-openvuplus/recipes-devtools/opkg/opkg/0003-opkg_remove-auto-delete-.pyo-files.patch new file mode 100644 index 0000000..403c074 --- /dev/null +++ b/meta-openvuplus/recipes-devtools/opkg/opkg/0003-opkg_remove-auto-delete-.pyo-files.patch @@ -0,0 +1,21 @@ +diff --git a/libopkg/opkg_remove.c b/libopkg/opkg_remove.c +index 23cec55..9ef6dc9 100644 +--- a/libopkg/opkg_remove.c ++++ b/libopkg/opkg_remove.c +@@ -394,8 +394,15 @@ remove_data_files_and_list(pkg_t *pkg) + } + + if (!conf->noaction) { +- opkg_msg(INFO, "Deleting %s.\n", file_name); ++ size_t l = strlen(file_name); ++ opkg_msg(INFO, "Deleting %s.\n", file_name); + unlink(file_name); ++ if (l >= 3 && !strcmp(&file_name[l - 3], ".py")) { ++ char pyo_file_name[l + 2]; ++ strcpy(pyo_file_name, file_name); ++ strcat(pyo_file_name, "o"); ++ unlink(pyo_file_name); ++ } + } else + opkg_msg(INFO, "Not deleting %s. (noaction)\n", + file_name); diff --git a/meta-openvuplus/recipes-devtools/opkg/opkg/0005-pkg_depends-remove-unused-variables-to-fix-compiler-.patch b/meta-openvuplus/recipes-devtools/opkg/opkg/0005-pkg_depends-remove-unused-variables-to-fix-compiler-.patch deleted file mode 100644 index 1820e52..0000000 --- a/meta-openvuplus/recipes-devtools/opkg/opkg/0005-pkg_depends-remove-unused-variables-to-fix-compiler-.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 4a5bc6cbce81497442f79ded5c78389024df0e60 Mon Sep 17 00:00:00 2001 -From: Andreas Oberritter <obi@opendreambox.org> -Date: Thu, 17 May 2012 01:14:23 +0200 -Subject: [PATCH 05/10] pkg_depends: remove unused variables to fix compiler - warnings - -Signed-off-by: Andreas Oberritter <obi@opendreambox.org> ---- - libopkg/pkg_depends.c | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/libopkg/pkg_depends.c b/libopkg/pkg_depends.c -index a61e80e..68a81f9 100644 ---- a/libopkg/pkg_depends.c -+++ b/libopkg/pkg_depends.c -@@ -269,13 +269,10 @@ is_pkg_a_replaces(pkg_t *pkg_scout,pkg_t *pkg) - { - int i ; - int replaces_count = pkg->replaces_count; -- abstract_pkg_t **replaces; - - if (pkg->replaces_count==0) // No replaces, it's surely a conflict - return 0; - -- replaces = pkg->replaces; -- - for (i = 0; i < replaces_count; i++) { - if (strcmp(pkg_scout->name,pkg->replaces[i]->name)==0) { // Found - opkg_msg(DEBUG2, "Seems I've found a replace %s %s\n", -@@ -295,7 +292,6 @@ pkg_vec_t * pkg_hash_fetch_conflicts(pkg_t * pkg) - depend_t ** possible_satisfiers; - depend_t * possible_satisfier; - int i, j, k; -- int count; - abstract_pkg_t * ab_pkg; - pkg_t **pkg_scouts; - pkg_t *pkg_scout; -@@ -315,7 +311,6 @@ pkg_vec_t * pkg_hash_fetch_conflicts(pkg_t * pkg) - } - installed_conflicts = pkg_vec_alloc(); - -- count = pkg->conflicts_count; - - - --- -1.7.9.5 - diff --git a/meta-openvuplus/recipes-devtools/opkg/opkg/0006-pkg_hash_fetch_conflicts-fix-possible-segfaults.patch b/meta-openvuplus/recipes-devtools/opkg/opkg/0006-pkg_hash_fetch_conflicts-fix-possible-segfaults.patch deleted file mode 100644 index 89934f2..0000000 --- a/meta-openvuplus/recipes-devtools/opkg/opkg/0006-pkg_hash_fetch_conflicts-fix-possible-segfaults.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e2b289330280e9f9fb5dd2cc10c736ca06d273f4 Mon Sep 17 00:00:00 2001 -From: Andreas Oberritter <obi@opendreambox.org> -Date: Thu, 17 May 2012 01:15:15 +0200 -Subject: [PATCH 06/10] pkg_hash_fetch_conflicts: fix possible segfaults - -Signed-off-by: Andreas Oberritter <obi@opendreambox.org> ---- - libopkg/pkg_depends.c | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/libopkg/pkg_depends.c b/libopkg/pkg_depends.c -index 68a81f9..6ff75f1 100644 ---- a/libopkg/pkg_depends.c -+++ b/libopkg/pkg_depends.c -@@ -322,10 +322,14 @@ pkg_vec_t * pkg_hash_fetch_conflicts(pkg_t * pkg) - /* foreach possible satisfier */ - for(j = 0; j < conflicts->possibility_count; j++){ - possible_satisfier = possible_satisfiers[j]; -- if (!possible_satisfier) -+ if (!possible_satisfier) { - opkg_msg(ERROR, "Internal error: possible_satisfier=NULL\n"); -- if (!possible_satisfier->pkg) -+ continue; -+ } -+ if (!possible_satisfier->pkg) { - opkg_msg(ERROR, "Internal error: possible_satisfier->pkg=NULL\n"); -+ continue; -+ } - test_vec = possible_satisfier->pkg->pkgs; - if (test_vec) { - /* pkg_vec found, it is an actual package conflict --- -1.7.9.5 - diff --git a/meta-openvuplus/recipes-devtools/opkg/opkg/0007-pkg_hash_fetch_conflicts-move-iteration-over-conflic.patch b/meta-openvuplus/recipes-devtools/opkg/opkg/0007-pkg_hash_fetch_conflicts-move-iteration-over-conflic.patch deleted file mode 100644 index 575c1e1..0000000 --- a/meta-openvuplus/recipes-devtools/opkg/opkg/0007-pkg_hash_fetch_conflicts-move-iteration-over-conflic.patch +++ /dev/null @@ -1,94 +0,0 @@ -From b925a520a63fb291675f707e602d04295236c85b Mon Sep 17 00:00:00 2001 -From: Andreas Oberritter <obi@opendreambox.org> -Date: Thu, 17 May 2012 01:17:52 +0200 -Subject: [PATCH 07/10] pkg_hash_fetch_conflicts: move iteration over - conflicts to subroutine - -Signed-off-by: Andreas Oberritter <obi@opendreambox.org> ---- - libopkg/pkg_depends.c | 46 ++++++++++++++++++++++++---------------------- - 1 file changed, 24 insertions(+), 22 deletions(-) - -diff --git a/libopkg/pkg_depends.c b/libopkg/pkg_depends.c -index 6ff75f1..1999b64 100644 ---- a/libopkg/pkg_depends.c -+++ b/libopkg/pkg_depends.c -@@ -284,39 +284,22 @@ is_pkg_a_replaces(pkg_t *pkg_scout,pkg_t *pkg) - - } - -- --pkg_vec_t * pkg_hash_fetch_conflicts(pkg_t * pkg) -+static void __pkg_hash_fetch_conflicts(pkg_t * pkg, pkg_vec_t * installed_conflicts) - { -- pkg_vec_t * installed_conflicts, * test_vec; -+ pkg_vec_t * test_vec; - compound_depend_t * conflicts; - depend_t ** possible_satisfiers; - depend_t * possible_satisfier; - int i, j, k; -- abstract_pkg_t * ab_pkg; - pkg_t **pkg_scouts; - pkg_t *pkg_scout; - -- /* -- * this is a setup to check for redundant/cyclic dependency checks, -- * which are marked at the abstract_pkg level -- */ -- if(!(ab_pkg = pkg->parent)){ -- opkg_msg(ERROR, "Internal error: %s not in hash table\n", pkg->name); -- return (pkg_vec_t *)NULL; -- } -- - conflicts = pkg->conflicts; -- if(!conflicts){ -- return (pkg_vec_t *)NULL; -- } -- installed_conflicts = pkg_vec_alloc(); -- -- -- -+ if(!conflicts) -+ return; - - /* foreach conflict */ - for(i = 0; i < pkg->conflicts_count; i++){ -- - possible_satisfiers = conflicts->possibilities; - - /* foreach possible satisfier */ -@@ -352,11 +335,30 @@ pkg_vec_t * pkg_hash_fetch_conflicts(pkg_t * pkg) - } - conflicts++; - } -+} -+ -+pkg_vec_t * pkg_hash_fetch_conflicts(pkg_t * pkg) -+{ -+ pkg_vec_t * installed_conflicts; -+ abstract_pkg_t * ab_pkg; -+ -+ /* -+ * this is a setup to check for redundant/cyclic dependency checks, -+ * which are marked at the abstract_pkg level -+ */ -+ if(!(ab_pkg = pkg->parent)){ -+ opkg_msg(ERROR, "Internal error: %s not in hash table\n", pkg->name); -+ return (pkg_vec_t *)NULL; -+ } -+ -+ installed_conflicts = pkg_vec_alloc(); -+ -+ __pkg_hash_fetch_conflicts(pkg, installed_conflicts); - - if (installed_conflicts->len) - return installed_conflicts; - pkg_vec_free(installed_conflicts); -- return (pkg_vec_t *)NULL; -+ return (pkg_vec_t *)NULL; - } - - int version_constraints_satisfied(depend_t * depends, pkg_t * pkg) --- -1.7.9.5 - diff --git a/meta-openvuplus/recipes-devtools/opkg/opkg/0008-pkg_hash_fetch_conflicts-take-into-account-conflicts.patch b/meta-openvuplus/recipes-devtools/opkg/opkg/0008-pkg_hash_fetch_conflicts-take-into-account-conflicts.patch deleted file mode 100644 index e958289..0000000 --- a/meta-openvuplus/recipes-devtools/opkg/opkg/0008-pkg_hash_fetch_conflicts-take-into-account-conflicts.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 53de52b533ee30676d051ee941cfc0a517e9190e Mon Sep 17 00:00:00 2001 -From: Andreas Oberritter <obi@opendreambox.org> -Date: Thu, 17 May 2012 01:18:42 +0200 -Subject: [PATCH 08/10] pkg_hash_fetch_conflicts: take into account conflicts - of installed packages - -Signed-off-by: Andreas Oberritter <obi@opendreambox.org> ---- - libopkg/pkg_depends.c | 17 +++++++++++++++++ - 1 file changed, 17 insertions(+) - -diff --git a/libopkg/pkg_depends.c b/libopkg/pkg_depends.c -index 1999b64..f237733 100644 ---- a/libopkg/pkg_depends.c -+++ b/libopkg/pkg_depends.c -@@ -337,6 +337,22 @@ static void __pkg_hash_fetch_conflicts(pkg_t * pkg, pkg_vec_t * installed_confli - } - } - -+static void __pkg_hash_fetch_conflictees(pkg_t *pkg, pkg_vec_t *installed_conflicts) -+{ -+ int i; -+ -+ pkg_vec_t *available_pkgs = pkg_vec_alloc(); -+ pkg_hash_fetch_all_installed(available_pkgs); -+ -+ for (i = 0; i < available_pkgs->len; i++) { -+ pkg_t *cpkg = available_pkgs->pkgs[i]; -+ if (pkg_conflicts(cpkg, pkg) && !is_pkg_in_pkg_vec(installed_conflicts, cpkg)) -+ pkg_vec_insert(installed_conflicts, cpkg); -+ } -+ -+ pkg_vec_free(available_pkgs); -+} -+ - pkg_vec_t * pkg_hash_fetch_conflicts(pkg_t * pkg) - { - pkg_vec_t * installed_conflicts; -@@ -354,6 +370,7 @@ pkg_vec_t * pkg_hash_fetch_conflicts(pkg_t * pkg) - installed_conflicts = pkg_vec_alloc(); - - __pkg_hash_fetch_conflicts(pkg, installed_conflicts); -+ __pkg_hash_fetch_conflictees(pkg, installed_conflicts); - - if (installed_conflicts->len) - return installed_conflicts; --- -1.7.9.5 - diff --git a/meta-openvuplus/recipes-devtools/opkg/opkg/0010-opkg_remove-auto-delete-.pyo-files.patch b/meta-openvuplus/recipes-devtools/opkg/opkg/0010-opkg_remove-auto-delete-.pyo-files.patch deleted file mode 100644 index 3bc2e5d..0000000 --- a/meta-openvuplus/recipes-devtools/opkg/opkg/0010-opkg_remove-auto-delete-.pyo-files.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 719cc4ab765c008bd7e4f2d085692657c33d171e Mon Sep 17 00:00:00 2001 -From: Andreas Oberritter <obi@opendreambox.org> -Date: Mon, 21 May 2012 14:05:37 +0200 -Subject: [PATCH 10/10] opkg_remove: auto-delete .pyo files - -Signed-off-by: Andreas Oberritter <obi@opendreambox.org> ---- - libopkg/opkg_remove.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/libopkg/opkg_remove.c b/libopkg/opkg_remove.c -index 5f4219b..4320dc3 100644 ---- a/libopkg/opkg_remove.c -+++ b/libopkg/opkg_remove.c -@@ -375,8 +375,15 @@ remove_data_files_and_list(pkg_t *pkg) - } - - if (!conf->noaction) { -+ size_t l = strlen(file_name); - opkg_msg(INFO, "Deleting %s.\n", file_name); - unlink(file_name); -+ if (l >= 3 && !strcmp(&file_name[l - 3], ".py")) { -+ char pyo_file_name[l + 2]; -+ strcpy(pyo_file_name, file_name); -+ strcat(pyo_file_name, "o"); -+ unlink(pyo_file_name); -+ } - } else - opkg_msg(INFO, "Not deleting %s. (noaction)\n", - file_name); --- -1.7.9.5 - diff --git a/meta-openvuplus/recipes-devtools/opkg/opkg/0011-opkg-allow-package-move-from-depends-to-recommends.patch b/meta-openvuplus/recipes-devtools/opkg/opkg/0011-opkg-allow-package-move-from-depends-to-recommends.patch deleted file mode 100644 index 5b5bc56..0000000 --- a/meta-openvuplus/recipes-devtools/opkg/opkg/0011-opkg-allow-package-move-from-depends-to-recommends.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -Naur trunk.org/libopkg/opkg_install.c trunk/libopkg/opkg_install.c ---- trunk.org/libopkg/opkg_install.c 2013-02-17 12:40:51.000000000 +0100 -+++ trunk/libopkg/opkg_install.c 2013-02-17 01:17:37.000000000 +0100 -@@ -366,11 +366,12 @@ - - for (k=0; k<count1; k++) { - cd1 = &pkg->depends[k]; -- if (cd1->type != DEPEND) -+ if (cd1->type != DEPEND && cd1->type != RECOMMEND) - continue; - for (l=0; l<cd1->possibility_count; l++) { -- if (cd0->possibilities[j] -- == cd1->possibilities[l]) { -+ if ( (cd0->type == cd1->type && cd0->possibilities[j] == cd1->possibilities[l]) || -+ (cd0->type != cd1->type && !strcmp(cd0->possibilities[j]->pkg->name, cd1->possibilities[l]->pkg->name) ) -+ ) { - found = 1; - break; - } diff --git a/meta-openvuplus/recipes-devtools/opkg/opkg/0012-opkg-dont-handle-recommends-as-depends.patch b/meta-openvuplus/recipes-devtools/opkg/opkg/0012-opkg-dont-handle-recommends-as-depends.patch deleted file mode 100644 index 9d7ddc3..0000000 --- a/meta-openvuplus/recipes-devtools/opkg/opkg/0012-opkg-dont-handle-recommends-as-depends.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Naur trunk.orig/libopkg/pkg_depends.c trunk/libopkg/pkg_depends.c ---- trunk.orig/libopkg/pkg_depends.c 2013-02-17 16:47:33.000000000 +0100 -+++ trunk/libopkg/pkg_depends.c 2013-02-17 16:07:11.000000000 +0100 -@@ -236,6 +236,11 @@ - /* just mention it politely */ - opkg_msg(NOTICE, "package %s suggests installing %s\n", - pkg->name, satisfier_entry_pkg->name); -+ } -+ else if (compound_depend->type == RECOMMEND) { -+ /* just mention it politely */ -+ opkg_msg(NOTICE, "package %s recommend installing %s\n", -+ pkg->name, satisfier_entry_pkg->name); - } else { - char ** newstuff = NULL; - diff --git a/meta-openvuplus/recipes-devtools/opkg/opkg/unarchive-fixed-uname-gname-cache.patch b/meta-openvuplus/recipes-devtools/opkg/opkg/unarchive-fixed-uname-gname-cache.patch deleted file mode 100644 index 3a13a5b..0000000 --- a/meta-openvuplus/recipes-devtools/opkg/opkg/unarchive-fixed-uname-gname-cache.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -Naur trunk.org/libbb/unarchive.c trunk/libbb/unarchive.c ---- trunk.org/libbb/unarchive.c 2012-08-30 13:45:44.000000000 +0200 -+++ trunk/libbb/unarchive.c 2012-09-13 11:50:57.822754393 +0200 -@@ -446,12 +446,12 @@ - struct passwd *passwd; - if (!uname) - return FALSE; -- if (!uname_cache[0] && strcmp(uname_cache, uname) == 0) -+ if (!strcmp(uname_cache, uname)) - return TRUE; - passwd = getpwnam(uname); - if (passwd) { - uid_cache = passwd->pw_uid; -- strncpy(uname, uname_cache, 32); -+ strncpy(uname_cache, uname, 32); - return TRUE; - } - return FALSE; -@@ -464,12 +464,12 @@ - struct group *group; - if (!gname) - return FALSE; -- if (!gname_cache[0] && strcmp(gname_cache, gname) == 0) -+ if (!strcmp(gname_cache, gname)) - return TRUE; - group = getgrnam(gname); - if (group) { - gid_cache = group->gr_gid; -- strncpy(gname, gname_cache, 32); -+ strncpy(gname_cache, gname, 32); - return TRUE; - } - return FALSE; diff --git a/meta-openvuplus/recipes-devtools/opkg/opkg_0.2.2.bbappend b/meta-openvuplus/recipes-devtools/opkg/opkg_0.2.2.bbappend deleted file mode 100644 index 17d44c3..0000000 --- a/meta-openvuplus/recipes-devtools/opkg/opkg_0.2.2.bbappend +++ /dev/null @@ -1,21 +0,0 @@ -PR .= "-vuplus0" - -PATCHES = " \ - file://0011-opkg-allow-package-move-from-depends-to-recommends.patch \ - file://0012-opkg-dont-handle-recommends-as-depends.patch" - -PATCHES_virtclass-native = "" - -SRC_URI += " \ - file://0002-Don-t-mark-Conflicts-as-Depends.patch \ - file://0003-Statically-link-libopkg-and-libbb.patch \ - file://0004-Makefile.am-remove-g-and-O-compiler-flags.patch \ - file://0005-pkg_depends-remove-unused-variables-to-fix-compiler-.patch \ - file://0006-pkg_hash_fetch_conflicts-fix-possible-segfaults.patch \ - file://0007-pkg_hash_fetch_conflicts-move-iteration-over-conflic.patch \ - file://0008-pkg_hash_fetch_conflicts-take-into-account-conflicts.patch \ - file://0010-opkg_remove-auto-delete-.pyo-files.patch \ - ${PATCHES} \ - file://unarchive-fixed-uname-gname-cache.patch" - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/meta-openvuplus/recipes-devtools/opkg/opkg_0.2.4.bbappend b/meta-openvuplus/recipes-devtools/opkg/opkg_0.2.4.bbappend new file mode 100644 index 0000000..9147533 --- /dev/null +++ b/meta-openvuplus/recipes-devtools/opkg/opkg_0.2.4.bbappend @@ -0,0 +1,10 @@ +PR .= "-vuplus0" + +SRC_URI += " \ + file://0001-pkg_hash_fetch_conflicts-move-iteration-over-conflic.patch \ + file://0002-pkg_hash_fetch_conflicts-take-into-account-conflicts.patch \ + file://0003-opkg_remove-auto-delete-.pyo-files.patch \ + file://0004-Makefile.am-remove-g-and-O-compiler-flags.patch \ +" + +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" diff --git a/meta-openvuplus/recipes-devtools/swig/swig.inc b/meta-openvuplus/recipes-devtools/swig/swig.inc deleted file mode 100644 index 59f385e..0000000 --- a/meta-openvuplus/recipes-devtools/swig/swig.inc +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION = "SWIG - Simplified Wrapper and Interface Generator" -HOMEPAGE = "http://swig.sourceforge.net/" -LICENSE = "BSD & GPLv3" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e7807a6282784a7dde4c846626b08fc6 \ - file://LICENSE-GPL;md5=d32239bcb673463ab874e80d47fae504 \ - file://LICENSE-UNIVERSITIES;md5=e0eaeeef7b2662c0c2d0d3c0b2509f75" - -SECTION = "devel" -INC_PR = "r1" - -DEPENDS = "python" - -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz" - -inherit autotools - -EXTRA_OECONF = " --without-guile " - -BBCLASSEXTEND = "native" - -do_configure() { - oe_runconf -} - diff --git a/meta-openvuplus/recipes-devtools/swig/swig_2.0.4.bb b/meta-openvuplus/recipes-devtools/swig/swig_2.0.4.bb deleted file mode 100644 index 2a28b41..0000000 --- a/meta-openvuplus/recipes-devtools/swig/swig_2.0.4.bb +++ /dev/null @@ -1,11 +0,0 @@ -require swig.inc - -LIC_FILES_CHKSUM = "file://LICENSE;md5=e7807a6282784a7dde4c846626b08fc6 \ - file://LICENSE-GPL;md5=d32239bcb673463ab874e80d47fae504 \ - file://LICENSE-UNIVERSITIES;md5=8ce9dcc8f7c994de4a408b205c72ba08" - -DEPENDS += "libpcre-native" -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "4319c503ee3a13d2a53be9d828c3adc0" -SRC_URI[sha256sum] = "763a117730d26f8e5ed67f5718c6c0761fbb8461680fc20269db8c0839e1ec8a" diff --git a/meta-openvuplus/recipes-extended/ethtool/ethtool_3.14.bbappend b/meta-openvuplus/recipes-extended/ethtool/ethtool_3.16.bbappend index 4019644..4019644 100644 --- a/meta-openvuplus/recipes-extended/ethtool/ethtool_3.14.bbappend +++ b/meta-openvuplus/recipes-extended/ethtool/ethtool_3.16.bbappend diff --git a/meta-openvuplus/recipes-extended/shadow/shadow-securetty_4.1.4.3.bbappend b/meta-openvuplus/recipes-extended/shadow/shadow-securetty_4.2.1.bbappend index f6a5fef..f6a5fef 100644 --- a/meta-openvuplus/recipes-extended/shadow/shadow-securetty_4.1.4.3.bbappend +++ b/meta-openvuplus/recipes-extended/shadow/shadow-securetty_4.2.1.bbappend diff --git a/meta-openvuplus/recipes-extended/shadow/shadow_4.1.4.3.bbappend b/meta-openvuplus/recipes-extended/shadow/shadow_4.%.bbappend index 30c736c..30c736c 100644 --- a/meta-openvuplus/recipes-extended/shadow/shadow_4.1.4.3.bbappend +++ b/meta-openvuplus/recipes-extended/shadow/shadow_4.%.bbappend diff --git a/meta-openvuplus/recipes-extended/smartmontools/smartmontools.inc b/meta-openvuplus/recipes-extended/smartmontools/smartmontools.inc deleted file mode 100644 index c1ded3a..0000000 --- a/meta-openvuplus/recipes-extended/smartmontools/smartmontools.inc +++ /dev/null @@ -1,10 +0,0 @@ -SECTION = "console/utils" -SUMMARY = "Control and monitor storage systems using S.M.A.R.T." -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -INC_PR = "r1" - -SRC_URI = "${SOURCEFORGE_MIRROR}/smartmontools/smartmontools-${PV}.tar.gz" -S = "${WORKDIR}/smartmontools-${PV}" - -inherit autotools diff --git a/meta-openvuplus/recipes-extended/smartmontools/smartmontools_5.42.bb b/meta-openvuplus/recipes-extended/smartmontools/smartmontools_5.42.bb deleted file mode 100644 index 98ebb37..0000000 --- a/meta-openvuplus/recipes-extended/smartmontools/smartmontools_5.42.bb +++ /dev/null @@ -1,6 +0,0 @@ -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "4460bf9a79a1252ff5c00ba52cf76b2a" -SRC_URI[sha256sum] = "b664d11e814e114ce3a32a4fa918c9e649c684e2897c007b2a8b92574decc374" - -require smartmontools.inc diff --git a/meta-openvuplus/recipes-extended/tzdata/tzdata_2013i.bbappend b/meta-openvuplus/recipes-extended/tzdata/tzdata_2013i.bbappend deleted file mode 100644 index aab9773..0000000 --- a/meta-openvuplus/recipes-extended/tzdata/tzdata_2013i.bbappend +++ /dev/null @@ -1,83 +0,0 @@ -PR .= "-vuplus0" - -DEFAULT_TIMEZONE = "CET" - -FILES_${PN} = " \ - ${datadir}/zoneinfo/Africa/Casablanca \ - ${datadir}/zoneinfo/Africa/Harare \ - ${datadir}/zoneinfo/Africa/Kinshasa \ - ${datadir}/zoneinfo/Africa/Nairobi \ - ${datadir}/zoneinfo/America/Anchorage \ - ${datadir}/zoneinfo/America/Bogota \ - ${datadir}/zoneinfo/America/Caracas \ - ${datadir}/zoneinfo/America/Danmarkshavn \ - ${datadir}/zoneinfo/America/Halifax \ - ${datadir}/zoneinfo/America/Manaus \ - ${datadir}/zoneinfo/America/Noronha \ - ${datadir}/zoneinfo/America/Regina \ - ${datadir}/zoneinfo/America/Santiago \ - ${datadir}/zoneinfo/America/Sao_Paulo \ - ${datadir}/zoneinfo/America/St_Johns \ - ${datadir}/zoneinfo/America/Tijuana \ - ${datadir}/zoneinfo/Asia/Almaty \ - ${datadir}/zoneinfo/Asia/Baghdad \ - ${datadir}/zoneinfo/Asia/Baku \ - ${datadir}/zoneinfo/Asia/Bangkok \ - ${datadir}/zoneinfo/Asia/Calcutta \ - ${datadir}/zoneinfo/Asia/Colombo \ - ${datadir}/zoneinfo/Asia/Dhaka \ - ${datadir}/zoneinfo/Asia/Hong_Kong \ - ${datadir}/zoneinfo/Asia/Irkutsk \ - ${datadir}/zoneinfo/Asia/Jerusalem \ - ${datadir}/zoneinfo/Asia/Kabul \ - ${datadir}/zoneinfo/Asia/Kathmandu \ - ${datadir}/zoneinfo/Asia/Kolkata \ - ${datadir}/zoneinfo/Asia/Krasnoyarsk \ - ${datadir}/zoneinfo/Asia/Kuala_Lumpur \ - ${datadir}/zoneinfo/Asia/Magadan \ - ${datadir}/zoneinfo/Asia/Muscat \ - ${datadir}/zoneinfo/Asia/Omsk \ - ${datadir}/zoneinfo/Asia/Rangoon \ - ${datadir}/zoneinfo/Asia/Riyadh \ - ${datadir}/zoneinfo/Asia/Seoul \ - ${datadir}/zoneinfo/Asia/Taipei \ - ${datadir}/zoneinfo/Asia/Tashkent \ - ${datadir}/zoneinfo/Asia/Tehran \ - ${datadir}/zoneinfo/Asia/Tokyo \ - ${datadir}/zoneinfo/Asia/Vladivostok \ - ${datadir}/zoneinfo/Asia/Yakutsk \ - ${datadir}/zoneinfo/Atlantic/Azores \ - ${datadir}/zoneinfo/Atlantic/Cape_Verde \ - ${datadir}/zoneinfo/Australia/Adelaide \ - ${datadir}/zoneinfo/Australia/Brisbane \ - ${datadir}/zoneinfo/Australia/Darwin \ - ${datadir}/zoneinfo/Australia/Hobart \ - ${datadir}/zoneinfo/Australia/Perth \ - ${datadir}/zoneinfo/Australia/Sydney \ - ${datadir}/zoneinfo/Brazil/East \ - ${datadir}/zoneinfo/Brazil/West \ - ${datadir}/zoneinfo/Canada/Newfoundland \ - ${datadir}/zoneinfo/Canada/Saskatchewan \ - ${datadir}/zoneinfo/CET \ - ${datadir}/zoneinfo/CST6CDT \ - ${datadir}/zoneinfo/EST \ - ${datadir}/zoneinfo/EST5EDT \ - ${datadir}/zoneinfo/Europe/Dublin \ - ${datadir}/zoneinfo/Europe/Istanbul \ - ${datadir}/zoneinfo/Europe/Moscow \ - ${datadir}/zoneinfo/MST \ - ${datadir}/zoneinfo/MST7MDT \ - ${datadir}/zoneinfo/Pacific/Auckland \ - ${datadir}/zoneinfo/Pacific/Fiji \ - ${datadir}/zoneinfo/Pacific/Guam \ - ${datadir}/zoneinfo/Pacific/Honolulu \ - ${datadir}/zoneinfo/Pacific/Kwajalein \ - ${datadir}/zoneinfo/Pacific/Midway \ - ${datadir}/zoneinfo/Pacific/Pacific/Norfolk \ - ${datadir}/zoneinfo/Pacific/Tongatapu \ - ${sysconfdir}/localtime \ - ${sysconfdir}/timezone " - -PACKAGES += "${PN}-base" - -FILES_${PN}-base = "${datadir}/zoneinfo" diff --git a/meta-openvuplus/recipes-multimedia/libav/libav_0.8.9.bbappend b/meta-openvuplus/recipes-multimedia/libav/libav_0.8.%.bbappend index 0f0a0d4..08f560d 100644 --- a/meta-openvuplus/recipes-multimedia/libav/libav_0.8.9.bbappend +++ b/meta-openvuplus/recipes-multimedia/libav/libav_0.8.%.bbappend @@ -1,8 +1,6 @@ LICENSE = "LGPLv2.1+" PR .= "-vuplus0" - - EXTRA_OECONF += "--disable-gpl --disable-nonfree --disable-version3" PACKAGECONFIG = "bzip2" diff --git a/meta-openvuplus/recipes-support/sqlite/sqlite3_3.8.4.3.bbappend b/meta-openvuplus/recipes-support/sqlite/sqlite3_3.8.4.3.bbappend deleted file mode 100644 index f9c383b..0000000 --- a/meta-openvuplus/recipes-support/sqlite/sqlite3_3.8.4.3.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -PR .= "-vuplus0" - -CFLAGS += "-DSQLITE_ENABLE_COLUMN_METADATA" diff --git a/meta-openvuplus/recipes-support/talloc/talloc_2.0.1.bbappend b/meta-openvuplus/recipes-support/talloc/talloc_2.0.1.bbappend deleted file mode 100644 index 06d0cc1..0000000 --- a/meta-openvuplus/recipes-support/talloc/talloc_2.0.1.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -PR .= "-vuplus0" - -B = "${S}" - diff --git a/meta-openvuplus/recipes-support/usb-modeswitch/usb-modeswitch_2.0.1.bbappend b/meta-openvuplus/recipes-support/usb-modeswitch/usb-modeswitch_2.0.1.bbappend deleted file mode 100644 index 06d0cc1..0000000 --- a/meta-openvuplus/recipes-support/usb-modeswitch/usb-modeswitch_2.0.1.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -PR .= "-vuplus0" - -B = "${S}" - diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb index 1a7ec06..b8795c5 100644 --- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb +++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb @@ -7,7 +7,7 @@ DEPENDS = "jpeg giflib libmad libpng libsigc++-1.2 gettext-native \ dreambox-dvbincludes freetype libdvbsi++ python swig-native \ libfribidi libxmlccwrap libdreamdvd gstreamer gst-plugin-dvbmediasink \ gst-plugins-bad gst-plugins-good gst-plugins-ugly python-wifi \ - hostap-daemon bridge-utils ntfs-3g dosfstools util-linux \ + hostapd bridge-utils ntfs-3g dosfstools util-linux \ " GST_RDEPENDS = "gst-plugins-base-decodebin gst-plugins-base-decodebin2 gst-plugins-base-app gst-plugins-bad-fragmented \ @@ -65,7 +65,7 @@ SUMMARY_enigma2-plugin-systemplugins-networkwizard = "provides easy step by step RDEPENDS_enigma2-plugin-extensions-webbrowser = "python-gdata libqtwebkite4 vuplus-webbrowser-utils qt4-embedded-fonts qt4-embedded-plugin-imageformat-gif qt4-embedded-plugin-imageformat-ico qt4-embedded-plugin-imageformat-jpeg qt4-embedded-plugin-imageformat-mng qt4-embedded-plugin-imageformat-svg qt4-embedded-plugin-imageformat-tiff qt4-embedded-plugin-iconengine-svgicon " SUMMARY_enigma2-plugin-systemplugins-crashreport = "automatically send crashlogs to Vu+" RDEPENDS_enigma2-plugin-systemplugins-crashreport = "python-twisted-mail python-twisted-names python-compression python-mime python-email" -RDEPENDS_enigma2-plugin-systemplugins-wirelessaccesspoint = "hostap-daemon bridge-utils" +RDEPENDS_enigma2-plugin-systemplugins-wirelessaccesspoint = "hostapd bridge-utils" RDEPENDS_enigma2-plugin-extensions-streamtv = "librtmp0 gst-plugins-bad-rtmp " diff --git a/meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-enigma2.bb b/meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-enigma2.bb index 20caccc..eac1aae 100644 --- a/meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-enigma2.bb +++ b/meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-enigma2.bb @@ -4,10 +4,10 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" PR = "r2" -inherit packagegroup - PACKAGE_ARCH = "${MACHINE_ARCH}" +inherit packagegroup + RDEPENDS_${PN} += " \ enigma2 \ enigma2-defaultservices \ diff --git a/meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-essential.bb b/meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-essential.bb index 1625811..784a777 100644 --- a/meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-essential.bb +++ b/meta-openvuplus/recipes-vuplus/packagegroups/packagegroup-vuplus-essential.bb @@ -10,10 +10,10 @@ RRECOMMENDS_${PN} += '${KERNEL_DVB_MODULES}' PR = "r5" -inherit packagegroup - PACKAGE_ARCH = "${MACHINE_ARCH}" +inherit packagegroup + ESSENTIAL_RDEPENDS = " \ " diff --git a/openembedded-core b/openembedded-core -Subproject be0327b6a900be5434b6b1f08277faf2f65d5da +Subproject 219e793907406eabf632e784e3a11ab9acb77cf |