Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/openpli/openpli-oe-core
Browse files Browse the repository at this point in the history
…into develop
  • Loading branch information
sid8796 committed Jul 22, 2020
2 parents cd20e3c + 3d4d8f1 commit 2b411c9
Show file tree
Hide file tree
Showing 30 changed files with 167 additions and 29 deletions.
2 changes: 1 addition & 1 deletion bitbake
Submodule bitbake updated from 683618 to fd279f
2 changes: 1 addition & 1 deletion meta-gfutures
2 changes: 1 addition & 1 deletion meta-maxytec
2 changes: 1 addition & 1 deletion meta-openembedded
Submodule meta-openembedded updated from 9e60d3 to 2b5dd1
2 changes: 1 addition & 1 deletion meta-openpli/conf/distro/reporefs.conf
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ SRCREV_pn-firmware-rtl8xxxu ??= "${AUTOREV}"
SRCREV_pn-firmware-zd1211 ??= "${AUTOREV}"

# wlan kernel modules
SRCREV_pn-kernel-module-88xxau ??= "${AUTOREV}"
SRCREV_pn-kernel-module-88xxau ??= "cddf06aa3929eb4072ded52912578fa4083a7c0b"
SRCREV_pn-kernel-module-rt8188eu ??= "${AUTOREV}"
SRCREV_pn-kernel-module-8192eu ??= "e7361e951c15d998f8c63b45478ef320d447f769"
SRCREV_pn-kernel-module-8723bu ??= "a8bd4b6c0481479408e67ac2e1c6fd5dc499e37f"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:${THISDIR}/files:"

SRC_URI += "file://0001-binutils-missing-string-include.patch"
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
diff -ur a/gold/debug.h b/gold/debug.h
--- a/gold/debug.h 2020-07-17 20:56:54.213143987 +0200
+++ b/gold/debug.h 2020-07-18 12:48:13.035259962 +0200
@@ -24,6 +24,7 @@
#define GOLD_DEBUG_H

#include <cstring>
+#include <string>

#include "parameters.h"
#include "errors.h"
3 changes: 3 additions & 0 deletions meta-openpli/recipes-devtools/binutils/binutils_2.32.bbappend
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:${THISDIR}/files:"

SRC_URI += "file://0001-binutils-program-name-multiply-defined.patch"
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
diff -ur a/binutils/coffdump.c b/binutils/coffdump.c
--- a/binutils/coffdump.c 2020-07-18 13:13:12.243376649 +0200
+++ b/binutils/coffdump.c 2020-07-18 16:25:32.150313514 +0200
@@ -456,7 +456,7 @@
dump_coff_section (ptr->sections + i);
}

-char * program_name;
+extern char * program_name;

static void
show_usage (FILE *file, int status)
diff -ur a/binutils/srconv.c b/binutils/srconv.c
--- a/binutils/srconv.c 2020-07-18 13:13:12.318377805 +0200
+++ b/binutils/srconv.c 2020-07-18 16:26:34.857280409 +0200
@@ -1687,7 +1687,7 @@
}
}

-char *program_name;
+extern char *program_name;

ATTRIBUTE_NORETURN static void
show_usage (FILE *ffile, int status)
diff -ur a/binutils/sysdump.c b/binutils/sysdump.c
--- a/binutils/sysdump.c 2020-07-18 13:13:12.319377820 +0200
+++ b/binutils/sysdump.c 2020-07-18 16:27:15.699910180 +0200
@@ -633,7 +633,7 @@
}
}

-char *program_name;
+extern char *program_name;

ATTRIBUTE_NORETURN static void
show_usage (FILE *ffile, int status)
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff -ur a/pseudo_ipc.h b/pseudo_ipc.h
--- a/pseudo_ipc.h 2020-07-18 11:00:11.255315080 +0200
+++ b/pseudo_ipc.h 2020-07-18 11:08:29.681000414 +0200
@@ -29,7 +29,7 @@
char path[];
} pseudo_msg_t;

-enum {
+typedef enum {
PSA_EXEC = 1,
PSA_WRITE = (PSA_EXEC << 1),
PSA_READ = (PSA_WRITE << 1),
3 changes: 3 additions & 0 deletions meta-openpli/recipes-devtools/pseudo/pseudo_git.bbappend
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:${THISDIR}/files:"

SRC_URI += "file://0001-pseudo-double-definition.patch"
5 changes: 2 additions & 3 deletions meta-openpli/recipes-devtools/python/python-youtube-dl.bb
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@ DEPENDS = "libxml2 bash-completion"
inherit gitpkgv

SRCREV = "${AUTOREV}"
PV = "2020.05.08+git${SRCPV}"
PKGV = "2020.05.08+git${GITPKGV}"

PV = "git${SRCPV}"
PKGV = "${GITPKGVTAG}"
SRC_URI = "git://github.com/ytdl-org/youtube-dl.git;protocol=https;branch=master"

S = "${WORKDIR}/git"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
diff -ur a/src/rpc_com.h b/src/rpc_com.h
--- a/src/rpc_com.h 2018-08-27 16:06:49.000000000 +0200
+++ b/src/rpc_com.h 2020-07-18 10:17:29.390812897 +0200
@@ -61,8 +61,8 @@
void __xprt_set_raddr(SVCXPRT *, const struct sockaddr_storage *);


-SVCXPRT **__svc_xports;
-int __svc_maxrec;
+extern SVCXPRT **__svc_xports;
+extern int __svc_maxrec;

#ifdef __cplusplus
}
diff -ur a/src/svc_vc.c b/src/svc_vc.c
--- a/src/svc_vc.c 2018-08-27 16:06:49.000000000 +0200
+++ b/src/svc_vc.c 2020-07-18 10:21:50.074832510 +0200
@@ -62,6 +62,8 @@

#include <getpeereid.h>

+SVCXPRT **__svc_xports;
+int __svc_maxrec;

extern rwlock_t svc_fd_lock;

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:${THISDIR}/files:"

SRC_URI += "file://0001-libtirpc-fix-double-definitions.patch"
14 changes: 7 additions & 7 deletions meta-openpli/recipes-extended/timezone/timezone.inc
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ SECTION = "base"
LICENSE = "PD & BSD & BSD-3-Clause"
LIC_FILES_CHKSUM = "file://LICENSE;md5=c679c9d6b02bc2757b3eaf8f53c43fba"

PV = "2019c"
PV = "2020a"

SRC_URI =" http://www.iana.org/time-zones/repository/releases/tzcode${PV}.tar.gz;name=tzcode \
http://www.iana.org/time-zones/repository/releases/tzdata${PV}.tar.gz;name=tzdata \
SRC_URI =" http://data.iana.org/time-zones/releases/tzcode${PV}.tar.gz;name=tzcode \
http://data.iana.org/time-zones/releases/tzdata${PV}.tar.gz;name=tzdata \
"

UPSTREAM_CHECK_URI = "http://www.iana.org/time-zones"

SRC_URI[tzcode.md5sum] = "195a17454c5db05cab96595380650391"
SRC_URI[tzcode.sha256sum] = "f6ebd3668e02d5ed223d3b7b1947561bf2d2da2f4bd1db61efefd9e06c167ed4"
SRC_URI[tzdata.md5sum] = "f6987e6dfdb2eb83a1b5076a50b80894"
SRC_URI[tzdata.sha256sum] = "79c7806dab09072308da0e3d22c37d3b245015a591891ea147d3b133b60ffc7c"
SRC_URI[tzcode.md5sum] = "f87c3477e85a5c4b00df0def6c6a0055"
SRC_URI[tzcode.sha256sum] = "7d2af7120ee03df71fbca24031ccaf42404752e639196fe93c79a41b38a6d669"
SRC_URI[tzdata.md5sum] = "96a985bb8eeab535fb8aa2132296763a"
SRC_URI[tzdata.sha256sum] = "547161eca24d344e0b5f96aff6a76b454da295dc14ed4ca50c2355043fb899a2"
4 changes: 2 additions & 2 deletions meta-openpli/recipes-openpli/fakelocale/fakelocale.bb
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ LOCALEDIR2 = "${datadir}/locale"

LANGUAGES = "ar_AE bg_BG ca_AD cs_CZ da_DK de_DE el_GR en_EN es_ES et_EE fa_IR fi_FI \
fr_FR fy_NL he_IL hr_HR hu_HU id_ID is_IS it_IT lt_LT lv_LV nl_NL nb_NO nn_NO pl_PL pt_BR pt_PT \
ru_RU sk_SK sl_SI sr_YU sv_SE th_TH tr_TR uk_UA vi_VN zh_CN zh_HK"
ru_RU sk_SK sl_SI sr_RS sv_SE th_TH tr_TR uk_UA vi_VN zh_CN zh_HK ro_RO ku_TR"

RPROVIDES_${PN} = "virtual-locale-ar virtual-locale-bg virtual-locale-ca virtual-locale-cs \
virtual-locale-da virtual-locale-de virtual-locale-el virtual-locale-en virtual-locale-es \
Expand All @@ -28,7 +28,7 @@ RPROVIDES_${PN} = "virtual-locale-ar virtual-locale-bg virtual-locale-ca virtual
virtual-locale-it virtual-locale-lt virtual-locale-lv virtual-locale-nb virtual-locale-nl \
virtual-locale-nn virtual-locale-pl virtual-locale-pt virtual-locale-ru virtual-locale-sk \
virtual-locale-sl virtual-locale-sr virtual-locale-sv virtual-locale-th virtual-locale-tr \
virtual-locale-uk virtual-locale-vi virtual-locale-zh"
virtual-locale-uk virtual-locale-vi virtual-locale-zh virtual-locale-ku virtual-locale-ro"

do_compile() {
install -d ${S}/output
Expand Down
11 changes: 6 additions & 5 deletions meta-openpli/recipes-openpli/fakelocale/files/locale.alias
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,18 @@ Deutsch de_DE
Arabic ar_AE
Bulgarian bg_BG
Catalan ca_AD
Croatia hr_HR
Croatian hr_HR
Czech cs_CZ
Danish da_DK
Dutch nl_NL
Estonian et_EE
Suomi fi_FI
Finnish fi_FI
French fr_FR
Ellinika el_GR
Frisian fy_NL
Hebrew he_IL
Hungarian hu_HU
Kurdish ku_TR
Lithuanian lt_LT
Latvian lv_LV
Icelandic is_IS
Expand All @@ -23,17 +24,17 @@ Norwegian Nynorsk nn_NO
Persian fa_IR
Polish pl_PL
Portugues pt_PT
Romania ro_RO
Romanian ro_RO
Russian ru_RU
Serbian sr_YU
Serbian sr_RS
Slovakian sk_SK
Slovenian sl_SI
Spanish es_ES
Svenska sv_SE
Thailand th_TH
Turkish tr_TR
Ukrainian uk_UA
India ur_IN
Urdu ur_IN
Vietnamese vi_VN
SChinese zh_CN
TChinese zh_HK
3 changes: 3 additions & 0 deletions meta-openpli/recipes-support/atk/at-spi2-atk_2.32.0.bbappend
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:${THISDIR}/files:"

SRC_URI += "file://0001-atk-double-definition.patch"
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
diff -ur a/tests/atk_suite.c b/tests/atk_suite.c
--- a/tests/atk_suite.c 2019-03-12 04:01:12.000000000 +0100
+++ b/tests/atk_suite.c 2020-07-18 20:30:37.402057524 +0200
@@ -29,6 +29,8 @@
#include "atk_suite.h"
#include "atk_test_util.h"

+pid_t child_pid;
+
static gchar *tdata_list = NULL;
static gchar *one_test = NULL;

diff -ur a/tests/atk_test_util.h b/tests/atk_test_util.h
--- a/tests/atk_test_util.h 2019-03-12 04:01:12.000000000 +0100
+++ b/tests/atk_test_util.h 2020-07-18 20:29:17.366823436 +0200
@@ -36,7 +36,7 @@
#include <locale.h>
#include "atk_suite.h"

-pid_t child_pid;
+extern pid_t child_pid;

void run_app (const char *file_name);
AtspiAccessible *get_root_obj (const char *file_name);
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
diff -ur a/src/parseopt.c b/src/parseopt.c
--- a/src/parseopt.c 2018-05-30 11:39:15.000000000 +0200
+++ b/src/parseopt.c 2020-07-18 09:39:03.639259823 +0200
@@ -257,4 +257,4 @@
char *parseopt_program_name;
-char *parseopt_program_doc;
-char *parseopt_program_args;
+extern char *parseopt_program_doc;
+extern char *parseopt_program_args;
const char *program_bug_address = "<" PACKAGE_BUGREPORT ">";
void (*parseopt_help_hook) (FILE *stream);
3 changes: 3 additions & 0 deletions meta-openpli/recipes-support/gdbm/gdbm_1.18.1.bbappend
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:${THISDIR}/files:"

SRC_URI += "file://0001-gdbm-double-definition.patch"
2 changes: 1 addition & 1 deletion meta-uclan
2 changes: 1 addition & 1 deletion openembedded-core
Submodule openembedded-core updated from 5ac98c to f5b90e

0 comments on commit 2b411c9

Please sign in to comment.