update recipes
This commit is contained in:
Yunlong Xiao
parent
ffac40cdad
commit
f65dfa72d5
|
|
@ -0,0 +1,26 @@
|
|||
Subject: local.mk: fix cross compiling problem
|
||||
|
||||
We meet the following error when cross compiling.
|
||||
| Makefile:3418: *** Recursive variable 'INSTALL' references itself (eventually). Stop.
|
||||
This patch fixes this problem.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
|
||||
---
|
||||
src/local.mk | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/local.mk b/src/local.mk
|
||||
index 36dfa4e..c5898cc 100644
|
||||
--- a/src/local.mk
|
||||
+++ b/src/local.mk
|
||||
@@ -649,4 +649,4 @@ cu_install_program = @INSTALL_PROGRAM@
|
||||
else
|
||||
cu_install_program = src/ginstall
|
||||
endif
|
||||
-INSTALL = $(cu_install_program) -c
|
||||
+INSTALL_PROGRAM = $(cu_install_program)
|
||||
--
|
||||
2.1.0
|
||||
|
||||
|
|
@ -0,0 +1,42 @@
|
|||
From a26530083a29eeee910bfd606ecc621acecd547a Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Wed, 3 Aug 2011 14:12:30 -0700
|
||||
Subject: [PATCH] coreutils: Fix build on uclibc
|
||||
|
||||
We have problem using hardcoded directories like /usr/local here
|
||||
which will be checked for cross builds. This is a special case which
|
||||
is valid for AIX only. We do not have AIX as one of our supported
|
||||
build host or target. Therefore we get rid of the hardcoded paths
|
||||
and make life easier for cross compilation process.
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
|
||||
Upstream-Status: Inappropriate [Upstream does care for AIX while we may not]
|
||||
|
||||
---
|
||||
m4/getloadavg.m4 | 12 ------------
|
||||
1 file changed, 12 deletions(-)
|
||||
|
||||
diff --git a/m4/getloadavg.m4 b/m4/getloadavg.m4
|
||||
index 8e96965..63782a2 100644
|
||||
--- a/m4/getloadavg.m4
|
||||
+++ b/m4/getloadavg.m4
|
||||
@@ -41,18 +41,6 @@ AC_CHECK_FUNC([getloadavg], [],
|
||||
[LIBS="-lutil $LIBS" gl_func_getloadavg_done=yes])
|
||||
fi
|
||||
|
||||
- if test $gl_func_getloadavg_done = no; then
|
||||
- # There is a commonly available library for RS/6000 AIX.
|
||||
- # Since it is not a standard part of AIX, it might be installed locally.
|
||||
- gl_getloadavg_LIBS=$LIBS
|
||||
- if test $cross_compiling != yes; then
|
||||
- LIBS="-L/usr/local/lib $LIBS"
|
||||
- fi
|
||||
- AC_CHECK_LIB([getloadavg], [getloadavg],
|
||||
- [LIBS="-lgetloadavg $LIBS" gl_func_getloadavg_done=yes],
|
||||
- [LIBS=$gl_getloadavg_LIBS])
|
||||
- fi
|
||||
-
|
||||
# Set up the replacement function if necessary.
|
||||
if test $gl_func_getloadavg_done = no; then
|
||||
HAVE_GETLOADAVG=0
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
#!/bin/sh
|
||||
|
||||
# remove any stale lock files so that the calls to groupadd/useradd don't stop
|
||||
# the ptest if re-using the same image
|
||||
rm -rf /etc/passwd.lock /etc/group.lock /etc/gshadow.lock
|
||||
|
||||
COREUTILSLIB=@libdir@/coreutils
|
||||
LOG="${COREUTILSLIB}/ptest/coreutils_ptest_$(date +%Y%m%d-%H%M%S).log"
|
||||
USERNAME="tester"
|
||||
groupadd ugroup1
|
||||
groupadd ugroup2
|
||||
useradd -G ugroup1,ugroup2 $USERNAME || echo "user $USERNAME already exists"
|
||||
|
||||
su tester -c "cd ${COREUTILSLIB}/ptest && make check-TESTS top_srcdir=. srcdir=." 2>&1 | tee -a ${LOG}
|
||||
userdel $USERNAME
|
||||
groupdel ugroup1
|
||||
groupdel ugroup2
|
||||
|
|
@ -0,0 +1,212 @@
|
|||
SUMMARY = "The basic file, shell and text manipulation utilities"
|
||||
DESCRIPTION = "The GNU Core Utilities provide the basic file, shell and text \
|
||||
manipulation utilities. These are the core utilities which are expected to exist on \
|
||||
every system."
|
||||
HOMEPAGE = "http://www.gnu.org/software/coreutils/"
|
||||
BUGTRACKER = "http://debbugs.gnu.org/coreutils"
|
||||
LICENSE = "GPL-3.0-or-later"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \
|
||||
file://src/ls.c;beginline=1;endline=15;md5=1fe89f62614b5e1f5475ec04d5899bc1 \
|
||||
"
|
||||
DEPENDS = "gmp libcap"
|
||||
DEPENDS_class-native = ""
|
||||
|
||||
inherit autotools gettext texinfo
|
||||
|
||||
SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \
|
||||
file://remove-usr-local-lib-from-m4.patch \
|
||||
file://0001-local.mk-fix-cross-compiling-problem.patch \
|
||||
file://run-ptest \
|
||||
"
|
||||
|
||||
SRC_URI[sha256sum] = "61a1f410d78ba7e7f37a5a4f50e6d1320aca33375484a3255eddf17a38580423"
|
||||
|
||||
# http://git.savannah.gnu.org/cgit/coreutils.git/commit/?id=v8.27-101-gf5d7c0842
|
||||
# runcon is not really a sandbox command, use `runcon ... setsid ...` to avoid this particular issue.
|
||||
CVE_CHECK_IGNORE += "CVE-2016-2781"
|
||||
|
||||
EXTRA_OECONF_class-target = "--enable-install-program=arch,hostname --libexecdir=${libdir}"
|
||||
EXTRA_OECONF_class-nativesdk = "--enable-install-program=arch,hostname"
|
||||
|
||||
# acl and xattr are not default features
|
||||
#
|
||||
PACKAGECONFIG_class-target ??= "\
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'acl', 'acl', '', d)} \
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'xattr', '', d)} \
|
||||
"
|
||||
|
||||
# The lib/oe/path.py requires xattr
|
||||
PACKAGECONFIG_class-native ??= "xattr"
|
||||
|
||||
# oe-core builds need xattr support
|
||||
PACKAGECONFIG_class-nativesdk ??= "xattr"
|
||||
|
||||
# with, without, depends, rdepends
|
||||
#
|
||||
PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl,"
|
||||
PACKAGECONFIG[xattr] = "--enable-xattr,--disable-xattr,attr,"
|
||||
PACKAGECONFIG[single-binary] = "--enable-single-binary,--disable-single-binary,,"
|
||||
PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux"
|
||||
|
||||
# [ df mktemp nice printenv base64 gets a special treatment and is not included in this
|
||||
bindir_progs = "arch basename chcon cksum comm csplit cut dir dircolors dirname du \
|
||||
env expand expr factor fmt fold groups head hostid id install \
|
||||
join link logname md5sum mkfifo nl nohup nproc od paste pathchk \
|
||||
pinky pr printf ptx readlink realpath runcon seq sha1sum sha224sum sha256sum \
|
||||
sha384sum sha512sum shred shuf sort split sum tac tail tee test timeout \
|
||||
tr truncate tsort tty unexpand uniq unlink uptime users vdir wc who whoami yes"
|
||||
|
||||
# hostname gets a special treatment and is not included in this
|
||||
base_bindir_progs = "cat chgrp chmod chown cp date dd echo false hostname kill ln ls mkdir \
|
||||
mknod mv pwd rm rmdir sleep stty sync touch true uname stat"
|
||||
|
||||
sbindir_progs= "chroot"
|
||||
|
||||
# Split stdbuf into its own package, so one can include
|
||||
# coreutils-stdbuf without getting the rest of coreutils, but make
|
||||
# coreutils itself pull in stdbuf, so IMAGE_INSTALL += "coreutils"
|
||||
# always provides all coreutils
|
||||
PACKAGE_BEFORE_PN_class-target += "${@bb.utils.contains('PACKAGECONFIG', 'single-binary', '', 'coreutils-stdbuf', d)}"
|
||||
FILES_coreutils-stdbuf = "${bindir}/stdbuf ${libdir}/coreutils/libstdbuf.so"
|
||||
RDEPENDS_coreutils_class-target += "${@bb.utils.contains('PACKAGECONFIG', 'single-binary', '', 'coreutils-stdbuf', d)}"
|
||||
|
||||
# However, when the single-binary PACKAGECONFIG is used, stdbuf
|
||||
# functionality is built into the single coreutils binary, so there's
|
||||
# no point splitting /usr/bin/stdbuf to its own package. Instead, add
|
||||
# an RPROVIDE so that rdepending on coreutils-stdbuf will work
|
||||
# regardless of whether single-binary is in effect.
|
||||
RPROVIDES_coreutils += "${@bb.utils.contains('PACKAGECONFIG', 'single-binary', 'coreutils-stdbuf', '', d)}"
|
||||
|
||||
# Let aclocal use the relative path for the m4 file rather than the
|
||||
# absolute since coreutils has a lot of m4 files, otherwise there might
|
||||
# be an "Argument list too long" error when it is built in a long/deep
|
||||
# directory.
|
||||
acpaths = "-I ./m4"
|
||||
|
||||
# Deal with a separate builddir failure if src doesn't exist when creating version.c/version.h
|
||||
do_compile_prepend () {
|
||||
mkdir -p ${B}/src
|
||||
}
|
||||
|
||||
do_install_class-native() {
|
||||
autotools_do_install
|
||||
# remove groups to fix conflict with shadow-native
|
||||
rm -f ${D}${STAGING_BINDIR_NATIVE}/groups
|
||||
# The return is a must since native doesn't need the
|
||||
# do_install_append() in the below.
|
||||
return
|
||||
}
|
||||
|
||||
do_install_append() {
|
||||
for i in df mktemp nice printenv base64; do mv ${D}${bindir}/$i ${D}${bindir}/$i.${BPN}; done
|
||||
|
||||
install -d ${D}${base_bindir}
|
||||
[ "${base_bindir}" != "${bindir}" ] && for i in ${base_bindir_progs}; do mv ${D}${bindir}/$i ${D}${base_bindir}/$i.${BPN}; done
|
||||
|
||||
install -d ${D}${sbindir}
|
||||
[ "${sbindir}" != "${bindir}" ] && for i in ${sbindir_progs}; do mv ${D}${bindir}/$i ${D}${sbindir}/$i.${BPN}; done
|
||||
|
||||
# [ requires special handling because [.coreutils will cause the sed stuff
|
||||
# in update-alternatives to fail, therefore use lbracket - the name used
|
||||
# for the actual source file.
|
||||
mv ${D}${bindir}/[ ${D}${bindir}/lbracket.${BPN}
|
||||
}
|
||||
|
||||
inherit update-alternatives
|
||||
|
||||
ALTERNATIVE_PRIORITY = "100"
|
||||
# Make hostname's priority higher than busybox but lower than net-tools
|
||||
ALTERNATIVE_PRIORITY[hostname] = "90"
|
||||
ALTERNATIVE_${PN} = "lbracket ${bindir_progs} ${base_bindir_progs} ${sbindir_progs} base32 base64 nice printenv mktemp df"
|
||||
ALTERNATIVE_${PN}-doc = "base64.1 nice.1 mktemp.1 df.1 groups.1 kill.1 uptime.1 stat.1 hostname.1"
|
||||
|
||||
ALTERNATIVE_LINK_NAME[hostname.1] = "${mandir}/man1/hostname.1"
|
||||
|
||||
ALTERNATIVE_LINK_NAME[base64] = "${base_bindir}/base64"
|
||||
ALTERNATIVE_TARGET[base64] = "${bindir}/base64.${BPN}"
|
||||
ALTERNATIVE_LINK_NAME[base64.1] = "${mandir}/man1/base64.1"
|
||||
|
||||
ALTERNATIVE_LINK_NAME[mktemp] = "${base_bindir}/mktemp"
|
||||
ALTERNATIVE_TARGET[mktemp] = "${bindir}/mktemp.${BPN}"
|
||||
ALTERNATIVE_LINK_NAME[mktemp.1] = "${mandir}/man1/mktemp.1"
|
||||
|
||||
ALTERNATIVE_LINK_NAME[df] = "${base_bindir}/df"
|
||||
ALTERNATIVE_TARGET[df] = "${bindir}/df.${BPN}"
|
||||
ALTERNATIVE_LINK_NAME[df.1] = "${mandir}/man1/df.1"
|
||||
|
||||
ALTERNATIVE_LINK_NAME[nice] = "${base_bindir}/nice"
|
||||
ALTERNATIVE_TARGET[nice] = "${bindir}/nice.${BPN}"
|
||||
ALTERNATIVE_LINK_NAME[nice.1] = "${mandir}/man1/nice.1"
|
||||
|
||||
ALTERNATIVE_LINK_NAME[printenv] = "${base_bindir}/printenv"
|
||||
ALTERNATIVE_TARGET[printenv] = "${bindir}/printenv.${BPN}"
|
||||
|
||||
ALTERNATIVE_LINK_NAME[lbracket] = "${bindir}/["
|
||||
ALTERNATIVE_TARGET[lbracket] = "${bindir}/lbracket.${BPN}"
|
||||
|
||||
ALTERNATIVE_LINK_NAME[groups.1] = "${mandir}/man1/groups.1"
|
||||
ALTERNATIVE_LINK_NAME[uptime.1] = "${mandir}/man1/uptime.1"
|
||||
ALTERNATIVE_LINK_NAME[kill.1] = "${mandir}/man1/kill.1"
|
||||
ALTERNATIVE_LINK_NAME[stat.1] = "${mandir}/man1/stat.1"
|
||||
|
||||
# The statx() requires glibc >= 2.28 and linux kernel >= 4.11, it doesn't work
|
||||
# when glibc >= 2.28 ((Ubuntu 20.04 in docker) and kernel < 4.11 (Host OS
|
||||
# CentOS 7), we can check kernel version and disable it, but that would cause
|
||||
# two different signatures for coreutils-native, so disable it unconditionally
|
||||
# for deterministic build.
|
||||
EXTRA_OECONF_append_class-native = " ac_cv_func_statx=0"
|
||||
|
||||
python __anonymous() {
|
||||
for prog in d.getVar('base_bindir_progs', True).split():
|
||||
d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('base_bindir', True), prog))
|
||||
|
||||
for prog in d.getVar('sbindir_progs', True).split():
|
||||
d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('sbindir', True), prog))
|
||||
}
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
|
||||
inherit ptest
|
||||
|
||||
RDEPENDS_${PN}-ptest += "bash findutils gawk liberror-perl make perl perl-modules python3-core sed shadow"
|
||||
|
||||
# -dev automatic dependencies fails as we don't want libmodule-build-perl-dev, its too heavy
|
||||
# may need tweaking if DEPENDS changes
|
||||
# Can't use ${PN}-dev here since flags with overrides and key expansion not supported
|
||||
RRECOMMENDS_coreutils-dev[nodeprrecs] = "1"
|
||||
RRECOMMENDS_${PN}-dev += "acl-dev attr-dev gmp-dev libcap-dev bash-dev findutils-dev gawk-dev shadow-dev"
|
||||
|
||||
do_install_ptest () {
|
||||
install -d ${D}${PTEST_PATH}/tests
|
||||
cp -r ${S}/tests/* ${D}${PTEST_PATH}/tests
|
||||
sed -i 's/ginstall/install/g' `grep -R ginstall ${D}${PTEST_PATH}/tests | awk -F: '{print $1}' | uniq`
|
||||
install -d ${D}${PTEST_PATH}/build-aux
|
||||
install ${S}/build-aux/test-driver ${D}${PTEST_PATH}/build-aux/
|
||||
cp ${B}/Makefile ${D}${PTEST_PATH}/
|
||||
cp ${S}/init.cfg ${D}${PTEST_PATH}/
|
||||
cp -r ${B}/src ${D}${PTEST_PATH}/
|
||||
cp -r ${S}/src/*.c ${D}${PTEST_PATH}/src
|
||||
sed -i '/^VPATH/s/= .*$/= ./g' ${D}${PTEST_PATH}/Makefile
|
||||
sed -i '/^PROGRAMS/s/^/#/g' ${D}${PTEST_PATH}/Makefile
|
||||
sed -i '/^Makefile: /s/^.*$/Makefile:/g' ${D}${PTEST_PATH}/Makefile
|
||||
sed -i '/^abs_srcdir/s/= .*$/= \$\{PWD\}/g' ${D}${PTEST_PATH}/Makefile
|
||||
sed -i '/^abs_top_builddir/s/= .*$/= \$\{PWD\}/g' ${D}${PTEST_PATH}/Makefile
|
||||
sed -i '/^abs_top_srcdir/s/= .*$/= \$\{PWD\}/g' ${D}${PTEST_PATH}/Makefile
|
||||
sed -i '/^built_programs/s/ginstall/install/g' ${D}${PTEST_PATH}/Makefile
|
||||
chmod -R 777 ${D}${PTEST_PATH}
|
||||
|
||||
# Disable subcase stty-pairs.sh, it will cause test framework hang
|
||||
sed -i '/stty-pairs.sh/d' ${D}${PTEST_PATH}/Makefile
|
||||
|
||||
# Disable subcase tail-2/assert.sh as it has issues on 32-bit systems
|
||||
sed -i '/assert.sh/d' ${D}${PTEST_PATH}/Makefile
|
||||
|
||||
# Tweak test d_type-check to use python3 instead of python
|
||||
sed -i "1s@.*@#!/usr/bin/python3@" ${D}${PTEST_PATH}/tests/d_type-check
|
||||
install ${B}/src/getlimits ${D}/${bindir}
|
||||
|
||||
# handle multilib
|
||||
sed -i s:@libdir@:${libdir}:g ${D}${PTEST_PATH}/run-ptest
|
||||
}
|
||||
|
||||
FILES_${PN}-ptest += "${bindir}/getlimits"
|
||||
|
|
@ -0,0 +1,43 @@
|
|||
From 168ba7a681be73ac024438e33e14fde1d5aea97d Mon Sep 17 00:00:00 2001
|
||||
From: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
Date: Fri, 30 Mar 2018 10:02:24 +0800
|
||||
Subject: [PATCH 1/2] tic hang
|
||||
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
|
||||
'tic' of some linux distributions (e.g. fedora 11) hang in an infinite
|
||||
loop when processing the original file.
|
||||
|
||||
Signed-off-by: anonymous
|
||||
|
||||
Rebase to 6.1
|
||||
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
---
|
||||
misc/terminfo.src | 11 +++++------
|
||||
1 file changed, 5 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/misc/terminfo.src b/misc/terminfo.src
|
||||
index 84f4810..6b385ec 100644
|
||||
--- a/misc/terminfo.src
|
||||
+++ b/misc/terminfo.src
|
||||
@@ -5562,12 +5562,11 @@ konsole-xf3x|KDE console window with keyboard for XFree86 3.x xterm,
|
||||
# The value for kbs (see konsole-vt100) reflects local customization rather
|
||||
# than the settings used for XFree86 xterm.
|
||||
konsole-xf4x|KDE console window with keyboard for XFree86 4.x xterm,
|
||||
- kend=\EOF, khome=\EOH, use=konsole+pcfkeys,
|
||||
- use=konsole-vt100,
|
||||
-
|
||||
-konsole+pcfkeys|konsole subset of xterm+pcfkeys,
|
||||
- kcbt=\E[Z, use=xterm+pcc2, use=xterm+pcf0,
|
||||
- use=xterm+pce2,
|
||||
+ kend=\EOF, kf1=\EOP, kf13=\EO2P, kf14=\EO2Q, kf15=\EO2R,
|
||||
+ kf16=\EO2S, kf17=\E[15;2~, kf18=\E[17;2~, kf19=\E[18;2~,
|
||||
+ kf2=\EOQ, kf20=\E[19;2~, kf21=\E[20;2~, kf22=\E[21;2~,
|
||||
+ kf23=\E[23;2~, kf24=\E[24;2~, kf3=\EOR, kf4=\EOS,
|
||||
+ khome=\EOH, use=konsole-vt100,
|
||||
|
||||
# Obsolete: vt100.keymap
|
||||
# KDE's "vt100" keyboard has no relationship to any terminal that DEC made, but
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
|
|
@ -0,0 +1,33 @@
|
|||
From ec87e53066a9942e9aaba817d71268342f5e83b9 Mon Sep 17 00:00:00 2001
|
||||
From: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
Date: Wed, 16 Aug 2017 14:45:27 +0800
|
||||
Subject: [PATCH] configure: reproducible
|
||||
|
||||
"configure" enforces -U for ar flags, breaking deterministic builds.
|
||||
The flag was added to fix some vaguely specified "recent POSIX binutil
|
||||
build problems" in 2015.
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
|
||||
|
||||
Rebase to 6.1
|
||||
|
||||
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
|
||||
---
|
||||
configure | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 421cf859..a1b7840d 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -5072,7 +5072,7 @@ else
|
||||
;;
|
||||
(*)
|
||||
cf_cv_ar_flags=unknown
|
||||
- for cf_ar_flags in -curvU -curv curv -crv crv -cqv cqv -rv rv
|
||||
+ for cf_ar_flags in -curv curv -crv crv -cqv cqv -rv rv
|
||||
do
|
||||
|
||||
# check if $ARFLAGS already contains this choice
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
From 10cd0c12a6e14fb4f0498c299c1dd32720b710da Mon Sep 17 00:00:00 2001
|
||||
From: Nathan Rossi <nathan@nathanrossi.com>
|
||||
Date: Mon, 14 Dec 2020 13:39:02 +1000
|
||||
Subject: [PATCH] gen-pkgconfig.in: Do not include LDFLAGS in generated pc
|
||||
files
|
||||
|
||||
Including the LDFLAGS in the pkgconfig output is problematic as OE
|
||||
includes build host specific paths and options (e.g. uninative and
|
||||
'-Wl,--dynamic-linker=').
|
||||
|
||||
Upstream-Status: Inappropriate [OE Specific]
|
||||
Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
|
||||
|
||||
---
|
||||
misc/gen-pkgconfig.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in
|
||||
index a45dd54f..85273054 100644
|
||||
--- a/misc/gen-pkgconfig.in
|
||||
+++ b/misc/gen-pkgconfig.in
|
||||
@@ -83,7 +83,7 @@ if [ "$includedir" != "/usr/include" ]; then
|
||||
fi
|
||||
|
||||
lib_flags=
|
||||
-for opt in -L$libdir @EXTRA_PKG_LDFLAGS@ @LIBS@
|
||||
+for opt in -L$libdir @LIBS@
|
||||
do
|
||||
case $opt in
|
||||
-l*) # LIBS is handled specially below
|
||||
|
|
@ -2,20 +2,25 @@ SUMMARY = "The New Curses library"
|
|||
DESCRIPTION = "SVr4 and XSI-Curses compatible curses library and terminfo tools including tic, infocmp, captoinfo. Supports color, multiple highlights, forms-drawing characters, and automatic recognition of keypad and function-key sequences. Extensions include resizable windows and mouse support on both xterm and Linux console using the gpm library."
|
||||
HOMEPAGE = "http://www.gnu.org/software/ncurses/ncurses.html"
|
||||
LICENSE = "MIT"
|
||||
LIC_FILES_CHKSUM = "file://ncurses/base/version.c;beginline=1;endline=27;md5=cbc180a8c44ca642e97c35452fab5f66"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=c5a4600fdef86384c41ca33ecc70a4b8;endline=27"
|
||||
SECTION = "libs"
|
||||
DEPENDS = "ncurses-native"
|
||||
DEPENDS_class-native = ""
|
||||
|
||||
BINCONFIG = "${bindir}/ncurses5-config ${bindir}/ncursesw5-config"
|
||||
BINCONFIG = "${bindir}/ncurses5-config ${bindir}/ncursesw5-config \
|
||||
${bindir}/ncurses6-config ${bindir}/ncursesw6-config"
|
||||
|
||||
inherit autotools binconfig-disabled multilib_header pkgconfig
|
||||
|
||||
# Upstream has useful patches at times at ftp://invisible-island.net/ncurses/
|
||||
SRC_URI = "git://anonscm.debian.org/collab-maint/ncurses.git"
|
||||
SRC_URI = "git://github.com/mirror/ncurses.git;protocol=https;branch=master"
|
||||
|
||||
EXTRA_AUTORECONF = "-I m4"
|
||||
CONFIG_SITE =+ "${WORKDIR}/config.cache"
|
||||
|
||||
CACHED_CONFIGUREVARS = "cf_cv_func_nanosleep=yes"
|
||||
CACHED_CONFIGUREVARS_append_linux = " cf_cv_working_poll=yes"
|
||||
|
||||
EXTRASITECONFIG = "CFLAGS='${CFLAGS} -I${SYSROOT_DESTDIR}${includedir}'"
|
||||
|
||||
# Whether to enable separate widec libraries; must be 'true' or 'false'
|
||||
#
|
||||
|
|
@ -56,6 +61,7 @@ EX_TERMCAP_class-nativesdk = ":/etc/termcap:/usr/share/misc/termcap"
|
|||
EX_TERMINFO = ""
|
||||
EX_TERMINFO_class-native = ":/etc/terminfo:/usr/share/terminfo:/usr/share/misc/terminfo:/lib/terminfo"
|
||||
EX_TERMINFO_class-nativesdk = ":/etc/terminfo:/usr/share/terminfo:/usr/share/misc/terminfo:/lib/terminfo"
|
||||
EX_TERMLIB ?= "tinfo"
|
||||
|
||||
# Helper function for do_configure to allow multiple configurations
|
||||
# $1 the directory to run configure in
|
||||
|
|
@ -65,7 +71,6 @@ ncurses_configure() {
|
|||
cd $1
|
||||
shift
|
||||
oe_runconf \
|
||||
--disable-static \
|
||||
--without-debug \
|
||||
--without-ada \
|
||||
--without-gpm \
|
||||
|
|
@ -78,12 +83,14 @@ ncurses_configure() {
|
|||
--disable-big-core \
|
||||
--program-prefix= \
|
||||
--with-ticlib \
|
||||
--with-termlib=tinfo \
|
||||
--with-termlib=${EX_TERMLIB} \
|
||||
--enable-sigwinch \
|
||||
--enable-pc-files \
|
||||
--disable-rpath-hack \
|
||||
${EXCONFIG_ARGS} \
|
||||
--with-manpage-format=normal \
|
||||
--without-manpage-renames \
|
||||
--disable-stripping \
|
||||
"$@" || return 1
|
||||
cd ..
|
||||
}
|
||||
|
|
@ -199,7 +206,7 @@ do_install() {
|
|||
ln -sf xterm-color ${D}${sysconfdir}/terminfo/x/xterm
|
||||
fi
|
||||
|
||||
rm -f ${D}${libdir}/terminfo
|
||||
rm -f ${D}${libdir}/terminfo ${D}${prefix}/lib/terminfo
|
||||
|
||||
# create linker scripts for libcurses.so and libncurses to
|
||||
# link against -ltinfo when needed. Some builds might break
|
||||
|
|
@ -225,7 +232,7 @@ do_install() {
|
|||
if [ ! -d "${D}${base_libdir}" ]; then
|
||||
# Setting base_libdir to libdir as is done in the -native
|
||||
# case will skip this code
|
||||
mkdir ${D}${base_libdir}
|
||||
mkdir -p ${D}${base_libdir}
|
||||
mv ${D}${libdir}/libncurses.so.* ${D}${base_libdir}
|
||||
! ${ENABLE_WIDEC} || \
|
||||
mv ${D}${libdir}/libncursesw.so.* ${D}${base_libdir}
|
||||
|
|
@ -235,8 +242,7 @@ do_install() {
|
|||
|
||||
# Use lnr to ensure this is a relative link despite absolute paths
|
||||
# (as we can't know the relationship between base_libdir and libdir).
|
||||
# At some point we can rely on coreutils 8.16 which has ln -r.
|
||||
lnr ${D}${base_libdir}/libtinfo.so.5 ${D}${libdir}/libtinfo.so
|
||||
ln -rs ${D}${base_libdir}/libtinfo.so.5 ${D}${libdir}/libtinfo.so
|
||||
fi
|
||||
if [ -d "${D}${includedir}/ncurses" ]; then
|
||||
for f in `find ${D}${includedir}/ncurses -name "*.h"`
|
||||
|
|
@ -253,9 +259,9 @@ python populate_packages_prepend () {
|
|||
libdir = d.expand("${libdir}")
|
||||
base_libdir = d.expand("${base_libdir}")
|
||||
pnbase = d.expand("${PN}-lib%s")
|
||||
do_split_packages(d, libdir, '^lib(.*)\.so\..*', pnbase, 'ncurses %s library', prepend=True, extra_depends = '', allow_links=True)
|
||||
do_split_packages(d, libdir, r'^lib(.*)\.so\..*', pnbase, 'ncurses %s library', prepend=True, extra_depends = '', allow_links=True)
|
||||
if libdir is not base_libdir:
|
||||
do_split_packages(d, base_libdir, '^lib(.*)\.so\..*', pnbase, 'ncurses %s library', prepend=True, extra_depends = '', allow_links=True)
|
||||
do_split_packages(d, base_libdir, r'^lib(.*)\.so\..*', pnbase, 'ncurses %s library', prepend=True, extra_depends = '', allow_links=True)
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -264,6 +270,11 @@ inherit update-alternatives
|
|||
ALTERNATIVE_PRIORITY = "100"
|
||||
|
||||
ALTERNATIVE_ncurses-tools_class-target = "clear reset"
|
||||
ALTERNATIVE_ncurses-terminfo_class-target = "st st-256color"
|
||||
|
||||
ALTERNATIVE_LINK_NAME[st] = "${datadir}/terminfo/s/st"
|
||||
|
||||
ALTERNATIVE_LINK_NAME[st-256color] = "${datadir}/terminfo/s/st-256color"
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
|
||||
|
|
@ -278,6 +289,8 @@ FILES_${PN} = "\
|
|||
${bindir}/tset \
|
||||
${bindir}/ncurses5-config \
|
||||
${bindir}/ncursesw5-config \
|
||||
${bindir}/ncurses6-config \
|
||||
${bindir}/ncursesw6-config \
|
||||
${datadir}/tabset \
|
||||
"
|
||||
|
||||
|
|
@ -296,7 +309,7 @@ FILES_${PN}-tools = "\
|
|||
"
|
||||
|
||||
# 'reset' is a symlink to 'tset' which is in the 'ncurses' package
|
||||
RDEPENDS_${PN}-tools = "${PN}"
|
||||
RDEPENDS_${PN}-tools = "${PN} ${PN}-terminfo-base"
|
||||
|
||||
FILES_${PN}-terminfo = "\
|
||||
${datadir}/terminfo \
|
||||
|
|
@ -308,3 +321,4 @@ FILES_${PN}-terminfo-base = "\
|
|||
|
||||
RSUGGESTS_${PN}-libtinfo = "${PN}-terminfo"
|
||||
RRECOMMENDS_${PN}-libtinfo = "${PN}-terminfo-base"
|
||||
SYSROOT_DIRS_remove = "${datadir}"
|
||||
|
|
|
|||
|
|
@ -0,0 +1,15 @@
|
|||
require ncurses.inc
|
||||
|
||||
SRC_URI += "file://0001-tic-hang.patch \
|
||||
file://0002-configure-reproducible.patch \
|
||||
file://0003-gen-pkgconfig.in-Do-not-include-LDFLAGS-in-generated.patch \
|
||||
"
|
||||
# commit id corresponds to the revision in package version
|
||||
SRCREV = "20db1fb41ec91cd8a1f528e770362092c5403378"
|
||||
S = "${WORKDIR}/git"
|
||||
EXTRA_OECONF += "--with-abi-version=5"
|
||||
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)$"
|
||||
UPSTREAM_VERSION_UNKNOWN = "1"
|
||||
|
||||
# This is needed when using patchlevel versions like 6.1+20181013
|
||||
CVE_VERSION = "${@d.getVar("PV").split('+')[0]}.${@d.getVar("PV").split('+')[1]}"
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
SUMMARY = "Audio format Conversion library"
|
||||
HOMEPAGE = "http://www.mega-nerd.com/libsndfile"
|
||||
AUTHOR = "Erik de Castro Lopo"
|
||||
DEPENDS = "flac libogg libvorbis sqlite3"
|
||||
SECTION = "libs/multimedia"
|
||||
LICENSE = "LGPLv2.1"
|
||||
|
||||
SRC_URI = "http://www.mega-nerd.com/libsndfile/files/libsndfile-${PV}.tar.gz"
|
||||
|
||||
SRC_URI[md5sum] = "fd1d97c6077f03b5d984d7956ffedb7a"
|
||||
SRC_URI[sha256sum] = "a391952f27f4a92ceb2b4c06493ac107896ed6c76be9a613a4731f076d30fac0"
|
||||
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=e77fe93202736b47c07035910f47974a"
|
||||
|
||||
S = "${WORKDIR}/libsndfile-${PV}"
|
||||
|
||||
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}"
|
||||
PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib"
|
||||
|
||||
inherit autotools lib_package pkgconfig
|
||||
|
||||
do_configure_prepend_arm() {
|
||||
export ac_cv_sys_largefile_source=1
|
||||
export ac_cv_sys_file_offset_bits=64
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
CVE: CVE-2021-43618
|
||||
Upstream-Status: Backport
|
||||
Signed-off-by: Ross Burton <ross.burton@arm.com>
|
||||
|
||||
# HG changeset patch
|
||||
# User Marco Bodrato <bodrato@mail.dm.unipi.it>
|
||||
# Date 1634836009 -7200
|
||||
# Node ID 561a9c25298e17bb01896801ff353546c6923dbd
|
||||
# Parent e1fd9db13b475209a864577237ea4b9105b3e96e
|
||||
mpz/inp_raw.c: Avoid bit size overflows
|
||||
|
||||
diff -r e1fd9db13b47 -r 561a9c25298e mpz/inp_raw.c
|
||||
--- a/mpz/inp_raw.c Tue Dec 22 23:49:51 2020 +0100
|
||||
+++ b/mpz/inp_raw.c Thu Oct 21 19:06:49 2021 +0200
|
||||
@@ -88,8 +88,11 @@
|
||||
|
||||
abs_csize = ABS (csize);
|
||||
|
||||
+ if (UNLIKELY (abs_csize > ~(mp_bitcnt_t) 0 / 8))
|
||||
+ return 0; /* Bit size overflows */
|
||||
+
|
||||
/* round up to a multiple of limbs */
|
||||
- abs_xsize = BITS_TO_LIMBS (abs_csize*8);
|
||||
+ abs_xsize = BITS_TO_LIMBS ((mp_bitcnt_t) abs_csize * 8);
|
||||
|
||||
if (abs_xsize != 0)
|
||||
{
|
||||
|
|
@ -13,7 +13,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
|
|||
|
||||
REVISION = ""
|
||||
SRC_URI = "https://gmplib.org/download/${BPN}/${BP}${REVISION}.tar.xz \
|
||||
"
|
||||
file://cve-2021-43618.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "0b82665c4a92fd2ade7440c13fcaa42b"
|
||||
SRC_URI[sha256sum] = "fd4829912cddd12f84181c3451cc752be224643e87fac497b69edddadc49b4f2"
|
||||
|
|
|
|||
Loading…
Reference in New Issue