diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2020-12-01 04:55:29 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2020-12-01 18:27:19 +0300 |
commit | 4b7c115404e4e18ca796c16a64c04ba299bf5cd0 (patch) | |
tree | aa5cf8759c4a5e15cc12e8795aa189b8e2d02b4a /meta-openembedded/meta-oe/recipes-kernel | |
parent | 6ce62a20847b1bd500386c842cf8b801b678bd1c (diff) | |
download | openbmc-4b7c115404e4e18ca796c16a64c04ba299bf5cd0.tar.xz |
meta-openembedded: subtree update:164a6030b0..f623d8b574
Adrian Freihofer (1):
paho-mqtt-c: upgrade 1.3.6 -> 1.3.7
Alexander Kamensky (2):
makedumpfile: add PACKAGECONFIG options for lzo and snappy compression
makedumpfile: upgrade 1.6.7 -> 1.6.8
Alexander Kanavin (4):
collect: do not build with -Werror
libsigrokdecode: add python 3.9 support
python3-mprpc: remove the recipe
gnome-calendar: update to 3.38.1, add libhandy 1.x support
Anatol Belski (1):
chrony: Patch CVE-2020-14367
Bartosz Golaszewski (1):
libgpiod: update v1.4.4 -> v1.4.5
Beni (1):
unbound: upgrade to 1.12.0
Gregory Anders (5):
Add suitesparse
Add python3-transitions
Add python3-dill
Add python3-cerberus
Add python3-cvxopt
Hongxu Jia (1):
lvm2.inc: switch branch master to main
Jasper Orschulko (1):
upgrade and de-blacklist nanopb recipe
Jose Quaresma (3):
spirv-tools: moved into OE-core, delete from meta-oe
srt: add receipe
opencv: Update 4.4.0 -> 4.5.0
Kai Kang (4):
xfce4-cpufreq-plugin: 1.2.1 -> 1.2.2
xfce4-weather-plugin: 0.10.1 -> 0.10.2
xfce4-mailwatch-plugin: 1.2.0 -> 1.3.0
tumbler: 0.2.9 -> 0.3.1
Khem Raj (71):
nodejs: Fix arm32/thumb builds with clang
nodejs: Update to 12.19.0
redis: Fix build on 32bit targets and clang
gperftools: Fix build with new musl updates
minifi-cpp: Fix build with riscv64/clang
graphviz: Upgrade to 2.44.1 release
musl-nscd: Update to latest
remmina: Update to 1.4.8
mdbus2: Fix build with vala 0.50
ibus: Update to 1.5.3 plus fix for vala 0.50
networkd-dispatcher: Upgrade to 2.1
geoclue: Use git fetcher
kernel-selftest: Disable vm packageconfig for riscv
layer.conf: Add hardknott to LAYERSERIES_COMPAT
fmt: Upgrade to 7.1.2
lksctp-tools: Update to latest master
fuse3: Upgrade to 3.10.0
rdma-core: Upgrade to 31.1
opengl-es-cts: Disable LTO
fluentbit: Disable LTO
traceroute: Fix build with LTO
cmocka: Fix buils with LTO
dovecot: Disable LTO
redis-plus-plus: Upgrade to 1.2.1
suitesparse: Exclude from world
python3-icu: Update to 2.6
meta-python: Drop RDEPEND'ing on python3-typing
python3-cvxopt: Exclude from world builds
packagegroup-meta-multimedia: Add srt
gedit: Inherit python3targetconfig
gmime: Fix append to do_configure
dconf: Add leading whitespace for append operator
kexec-tools-klibc: Add leading whitespace for append operator
spice: Add leading whitespace for append operator
meta-oe: Add leading whitespace for append operator
libgusb: Update to 0.3.5
botan: Mark incompatible with riscv32
projucer: Link with libatomic on rv32
mariadb: Fix build on 32bit arches with 64bit time_t
liburing: Fix build on 32-bit arches with 64-bit time_t
librtorrent: Disable instrumentation on rv32
ntopng: Link with libatomic on rv32
poco: Add riscv32 support
capnproto: Fix build on 32bit arches with 64bit time_t defaults
directfb: Fix build on riscv32
opensaf: Fix build on 32bit arches with 64bit time_t e.g. RISCV-32
rocksdb: Update to 6.12.7
qpdf: Link with libatomic on rv32
libkcapi: Fix build on riscv32
jack: Upgrade to 1.19.16
vlc: Fix build on riscv32
fluentbit: Link with libatomic on riscv32
openipmi: Inherit python3targetconfig
libplist: Inherit python3targetconfig
postgresql: Inherit python3targetconfig
python-grpcio-tools: Add missing space for append
python3-pykwalify: Do not unset _PYTHON_SYSCONFIGDATA_NAME
thingsboard-gateway: Move under dynamic layers
musl-nscd: Replace -fcommon with code patch
musl-nscd: Add missing deps on flex and bison during build
python3-pytest: Upgrade to 6.1.2
python3-hypothesis: Add recipe
python3-sortedcontainers: Add recipe
heaptrack: Fix build on musl
heaptrack: Mark RISCV host incompatible
packagegroup-meta-oe: Exclude heaptrack for rv32/rv64
chrony: Upgrade to 4.0
canutils,can-utils: Add cansequence to u-a as well
packagegroup-meta-python: Add newly added recipes to packagegroup-meta-python3
pipewire: Link with libatomic for riscv32
python3-matplotlib: Disable LTO for clang/riscv
Kory Maincent (1):
libftdi: add swig-native to dependencies
Leon Anavi (37):
python3-luma-oled: Upgrade 3.6.0 -> 3.7.0
python3-cryptography-vectors: Upgrade 3.1.1 -> 3.2
python3-pyexpect: Upgrade 1.0.20 -> 1.0.21
python3-markdown: Upgrade 3.3.2 -> 3.3.3
python3-sh: Upgrade 1.14.0 -> 1.14.1
python3-kiwisolver: Upgrade 1.2.0 -> 1.3.0
python3-aiohttp: Upgrade 3.7.1 -> 3.7.2
python3-aiofiles: Upgrade 0.5.0 -> 0.6.0
python3-regex: Upgrade 2020.10.23 -> 2020.10.28
python3-dateparser: Upgrade 0.7.6 -> 1.0.0
python3-langtable: Upgrade 0.0.53 -> 0.0.54
python3-kiwisolver: Upgrade 1.3.0 -> 1.3.1
python3-tornado: Upgrade 6.0.4 -> 6.1
python3-ipython: Upgrade 7.18.1 -> 7.19.0
python3-cmd2: Upgrade 1.3.11 -> 1.4.0
python3-dill: Upgrade 0.3.2 -> 0.3.3
python3-colorlog: Upgrade 4.4.0 -> 4.6.2
python3-pandas: Upgrade 1.1.3 -> 1.1.4
python3-attrs: 20.2.0 -> 20.3.0
python3-gmqtt: Upgrade 0.6.7 -> 0.6.8
python3-diskcache: Upgrade 5.0.3 -> 5.1.0
python3-croniter: Upgrade 0.3.35 -> 0.3.36
python3-bitarray: Upgrade 1.6.0 -> 1.6.1
python3-certifi: Upgrade 2020.6.20 -> 2020.11.8
python3-cantools: Upgrade 35.3.0 -> 35.5.0
python3-arpeggio: Upgrade 1.9.2 -> 1.10.1
python3-toml: Upgrade 0.10.1 -> 0.10.2
python3-pyrad: Upgrade 2.3 -> 2.4
python3-bitstruct: Upgrade 8.11.0 -> 8.11.1
python3-yarl: Upgrade 1.6.2 -> 1.6.3
python3-luma-core: Upgrade 1.17.3 -> 2.0.1
python3-luma-oled: Upgrade 3.7.0 -> 3.8.1
python3-fastnumbers: Upgrade 3.0.0 -> 3.1.0
python3-ansi2html: Upgrade 1.5.2 -> 1.6.0
python3-prettytable: Upgrade 1.0.1 -> 2.0.0
python3-urllib3: Upgrade 1.25.11 -> 1.26.2
python3-transitions: Upgrade 0.8.4 -> 0.8.5
Li Zhou (1):
ptpd: Solve memory leak for function NTPDCrequest
Maciej Pijanowski (2):
cdrkit: add native to BBCLASSEXTEND
cdrkit: split into more packages
Mark Jonas (5):
mbedtls: Fix typo in PACKAGECONFIG
python3-pyinotify: Add missing ctypes dependency
libsocketcan: Add PACKAGECONFIG options
libsocketcan: Update to 0.0.12
imagemagick: Add NOTICE to collected license texts
Max Kellermann (1):
php: remove the failing ${D}/${TMPDIR} code
Mingli Yu (6):
ndpi: add new recipe
libmaxminddb: add new recipe
ntopng: add new recipe
ntop: remove the recipe
packagegroup-meta-networking.bb: add ntopng related recipes
traceroute: set VPATH
Nick Rosbrook (3):
strongswan: add some PACKAGECONFIG options for EAP
strongswan: do not use deprecated stroke and starter by default
strongswan: remove ldap from default PACKAGECONFIG
Pierre-Jean Texier (1):
inotify-tools: upgrade 3.20.2.2 -> 3.20.11.0
Randy Witt (1):
numactl: Remove the recipe
Ricardo Salveti (3):
wireguard-module: upgrade 1.0.20200712 -> 1.0.20200908
wireguard-tools: upgrade 1.0.20200513 -> 1.0.20200827
wireguard-module: upgrade 1.0.20200908 -> 1.0.20201112
Sakib Sajal (1):
libssh2: fix ptest
Sinan Kaya (3):
collectd: fix the test condition for dash compatibility
heaptrack: add bitbake recipe
cpp-netlib: add bitbake recipe
Tim Orling (16):
python3-atomicwrites: drop (moved to oe-core)
python3-attrs: drop (moved to oe-core)
python3-iniconfig: drop (moved to oe-core)
python3-more-itertools: drop (moved to oe-core)
python3-pathlib2: drop (moved to oe-core)
python3-toml: drop (moved to oe-core)
python3-py: drop (moved to oe-core)
python3-setuptools-scm: drop (moved to oe-core)
python3-packaging: drop (moved to oe-core)
python3-wcwidth: drop (moved to oe-core)
python3-zipp: drop (moved to oe-core)
python3-importlib-metadata: drop (moved to oe-core)
python3-pluggy: drop (moved to oe-core)
python3-pytest: drop (moved to oe-core)
python3-hypothesis: drop (moved to oe-core)
python3-sortedcontainers: drop (moved to oe-core)
Trevor Gamblin (2):
python3-jinja2: Fix ptest RDEPENDS and file installation
python3-markupsafe: Fix ptest RDEPENDS and installation
William A. Kennington III (1):
span-lite: Bump e03d116..0.8.1
Yi Zhao (5):
minifi-cpp: specify GCC_AR and GCC_RANLIB
quagga: unify volatiles file name
minifi-cpp: depend on nettle and lz4
nss: upgrade 3.57 -> 3.59
krb5: upgrade 1.17.1 -> 1.17.2
Zang Ruochen (19):
libnftnl: upgrade 1.1.7 -> 1.1.8
xfsprogs: upgrade 5.8.0 -> 5.9.0
radvd: upgrade 2.18 -> 2.19
fmt: upgrade 7.0.3 -> 7.1.0
hidapi: upgrade 0.9.0 -> 0.10.0
libkcapi: upgrade 1.2.0 -> 1.2.1
modemmanager: upgrade 1.14.2 -> 1.14.6
nvme-cli: upgrade 1.12 -> 1.13
ostree: upgrade 2020.6 -> 2020.7
poppler-data: upgrade 0.4.9 -> 0.4.10
nftables: upgrade 0.9.6 -> 0.9.7
toybox: upgrade 0.8.3 -> 0.8.4
fbgrab: upgrade 1.3.3 -> 1.4
mraa: upgrade 2.1.0 -> 2.2.0
opensaf: upgrade 5.20.05 -> 5.20.08
openvpn: upgrade 2.4.9 -> 2.5.0
poppler: upgrade 20.10.0 -> 20.11.0
tmux: upgrade 3.1b -> 3.1c
xmlsec1: upgrade 1.2.30 -> 1.2.31
changqing.li@windriver.com (1):
thin-provisioning-tools: switch branch from master to main
hasan.men (2):
thingsboard-gateway: Add recipe for v2.5.2
python3-jsonpath-rw: Add recipe for v1.4.0
richard (1):
poco: Upgrade 1.9.4 -> 1.10.1
viatsk (1):
tcpdump: Patch for CVE-2020-8037
zangrc (27):
sshfs-fuse: upgrade 3.7.0 -> 3.7.1
can-utils: upgrade 2020.02.04 -> 2020.11.0
hwdata: upgrade 0.340 -> 0.341
libio-pty-perl: upgrade 1.14 -> 1.15
live555: upgrade 20200819 -> 20201105
zile: upgrade 2.4.14 -> 2.4.15
rdma-core: upgrade 31.1 -> 32.0
strongswan: upgrade 5.8.4 -> 5.9.1
fio: upgrade 3.22 -> 3.24
libharu: Fix the packaging bug
modemmanager: upgrade 1.14.6 -> 1.14.8
openldap: upgrade 2.4.51 -> 2.4.56
protobuf: upgrade 3.13.0.1 -> 3.14.0
nghttp2: upgrade 2.41.0 -> 2.42.0
nngpp: upgrade 1.2.4 -> 1.3.0
snort: upgrade 2.9.16.1 -> 2.9.17
weechat: upgrade 2.9 -> 3.0
cjson: upgrade 1.7.13 -> 1.7.14
cloc: upgrade 1.84 -> 1.88
jpnevulator: upgrade 2.3.5 -> 2.3.6
libjcat: upgrade 0.1.3 -> 0.1.4
libsigc++-3: upgrade 3.0.3 -> 3.0.6
ocl-icd: upgrade 2.2.12 -> 2.2.13
opencl-clhpp: upgrade 2.0.11 -> 2.0.12
ostree: upgrade 2020.7 -> 2020.8
pkcs11-helper: upgrade 1.26 -> 1.27
netplan: upgrade 0.99 -> 0.100
zhengruoqin (1):
dnf-plugin-tui: Update to the latest version
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I286bb6d58bf30588516b35ec06ddfd0bedee2e64
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-kernel')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb | 4 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-PATCH-Remove-duplicated-variable-definitions.patch | 104 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch | 26 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch | 24 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.8.bb (renamed from meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.7.bb) | 22 |
5 files changed, 45 insertions, 135 deletions
diff --git a/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb b/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb index 2b5ebcc27..7c36dfc60 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb @@ -27,6 +27,10 @@ PACKAGECONFIG_remove_arm = "bpf vm" # vm tests need libhugetlbfs starting 5.8+ (https://lkml.org/lkml/2020/4/22/1654) PACKAGECONFIG_remove_qemumips = "bpf vm" +# riscv does not support libhugetlbfs yet +PACKAGECONFIG_remove_riscv64 = "vm" +PACKAGECONFIG_remove_riscv32 = "vm" + PACKAGECONFIG[bpf] = ",,elfutils libcap libcap-ng rsync-native," PACKAGECONFIG[firmware] = ",,libcap, bash" PACKAGECONFIG[vm] = ",,libcap libhugetlbfs,libgcc bash" diff --git a/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-PATCH-Remove-duplicated-variable-definitions.patch b/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-PATCH-Remove-duplicated-variable-definitions.patch deleted file mode 100644 index 49777bcee..000000000 --- a/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-PATCH-Remove-duplicated-variable-definitions.patch +++ /dev/null @@ -1,104 +0,0 @@ -From 399f2c9a3acd5bd913e50a4dde52dee6527b297e Mon Sep 17 00:00:00 2001 -From: Kairui Song <kasong@redhat.com> -Date: Wed, 29 Jan 2020 13:37:13 +0800 -Subject: [PATCH] [PATCH] Remove duplicated variable definitions - -When building on Fedora 32 (with GCC 10), following error is observed: - -/usr/bin/ld: erase_info.o:/tmp/makedumpfile/makedumpfile.h:2010: multiple definition of - `crash_reserved_mem_nr'; elf_info.o:/tmp/makedumpfile/makedumpfile.h:2010: first defined here -/usr/bin/ld: erase_info.o:/tmp/makedumpfile/makedumpfile.h:2009: multiple definition of - `crash_reserved_mem'; elf_info.o:/tmp/makedumpfile/makedumpfile.h:2009: first defined here -/usr/bin/ld: erase_info.o:/tmp/makedumpfile/makedumpfile.h:1278: multiple definition of - `parallel_info_t'; elf_info.o:/tmp/makedumpfile/makedumpfile.h:1278: first defined here -/usr/bin/ld: erase_info.o:/tmp/makedumpfile/makedumpfile.h:1265: multiple definition of - `splitting_info_t'; elf_info.o:/tmp/makedumpfile/makedumpfile.h:1265: first defined here -... -collect2: error: ld returned 1 exit status -make: *** [Makefile:97: makedumpfile] Error 1 - -These variables are wrongly defined multiple times. So remove the -duplicated definitions. - -Upstream-Status: Backport [https://github.com/kraj/makedumpfile/commit/399f2c9a3acd5bd913e50a4dde52dee6527b297e] -Signed-off-by: Kairui Song <kasong@redhat.com> -Signed-off-by: Kazuhito Hagio <k-hagio-ab@nec.com> ---- - makedumpfile.c | 8 ++++---- - makedumpfile.h | 8 ++++---- - 2 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/makedumpfile.c b/makedumpfile.c -index e290fbd..ae7336a 100644 ---- a/makedumpfile.c -+++ b/makedumpfile.c -@@ -10954,7 +10954,7 @@ check_param_for_reassembling_dumpfile(int argc, char *argv[]) - return FALSE; - - if ((info->splitting_info -- = malloc(sizeof(splitting_info_t) * info->num_dumpfile)) -+ = malloc(sizeof(struct splitting_info) * info->num_dumpfile)) - == NULL) { - MSG("Can't allocate memory for splitting_info.\n"); - return FALSE; -@@ -11042,7 +11042,7 @@ check_param_for_creating_dumpfile(int argc, char *argv[]) - return FALSE; - } - if ((info->splitting_info -- = malloc(sizeof(splitting_info_t) * info->num_dumpfile)) -+ = malloc(sizeof(struct splitting_info) * info->num_dumpfile)) - == NULL) { - MSG("Can't allocate memory for splitting_info.\n"); - return FALSE; -@@ -11077,13 +11077,13 @@ check_param_for_creating_dumpfile(int argc, char *argv[]) - - if (info->num_threads) { - if ((info->parallel_info = -- malloc(sizeof(parallel_info_t) * info->num_threads)) -+ malloc(sizeof(struct parallel_info) * info->num_threads)) - == NULL) { - MSG("Can't allocate memory for parallel_info.\n"); - return FALSE; - } - -- memset(info->parallel_info, 0, sizeof(parallel_info_t) -+ memset(info->parallel_info, 0, sizeof(struct parallel_info) - * info->num_threads); - } - -diff --git a/makedumpfile.h b/makedumpfile.h -index 68d9691..7217407 100644 ---- a/makedumpfile.h -+++ b/makedumpfile.h -@@ -1262,7 +1262,7 @@ struct splitting_info { - mdf_pfn_t end_pfn; - off_t offset_eraseinfo; - unsigned long size_eraseinfo; --} splitting_info_t; -+}; - - struct parallel_info { - int fd_memory; -@@ -1275,7 +1275,7 @@ struct parallel_info { - #ifdef USELZO - lzo_bytep wrkmem; - #endif --} parallel_info_t; -+}; - - struct ppc64_vmemmap { - unsigned long phys; -@@ -2006,8 +2006,8 @@ struct memory_range { - }; - - #define CRASH_RESERVED_MEM_NR 8 --struct memory_range crash_reserved_mem[CRASH_RESERVED_MEM_NR]; --int crash_reserved_mem_nr; -+extern struct memory_range crash_reserved_mem[CRASH_RESERVED_MEM_NR]; -+extern int crash_reserved_mem_nr; - - unsigned long read_vmcoreinfo_symbol(char *str_symbol); - int readmem(int type_addr, unsigned long long addr, void *bufptr, size_t size); --- -2.28.0 - diff --git a/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch b/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch index ff093a72b..270cc3562 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch +++ b/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0001-makedumpfile-replace-hardcode-CFLAGS.patch @@ -17,10 +17,10 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com> Makefile | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) -diff --git a/Makefile b/Makefile -index 1fdb628..5dce589 100644 ---- a/Makefile -+++ b/Makefile +Index: git/Makefile +=================================================================== +--- git.orig/Makefile ++++ git/Makefile @@ -8,12 +8,6 @@ ifeq ($(strip $CC),) CC = gcc endif @@ -81,12 +81,12 @@ index 1fdb628..5dce589 100644 SRC_BASE = makedumpfile.c makedumpfile.h diskdump_mod.h sadump_mod.h sadump_info.h SRC_PART = print_info.c dwarf_info.c elf_info.c erase_info.c sadump_info.c cache.c tools.c OBJ_PART=$(patsubst %.c,%.o,$(SRC_PART)) -@@ -52,17 +53,17 @@ OBJ_ARCH=$(patsubst %.c,%.o,$(SRC_ARCH)) +@@ -52,12 +53,12 @@ OBJ_ARCH=$(patsubst %.c,%.o,$(SRC_ARCH)) LIBS = -ldw -lbz2 -ldl -lelf -lz ifneq ($(LINKTYPE), dynamic) --LIBS := -static $(LIBS) -+LIBS := $(LIBS) +-LIBS := -static $(LIBS) -llzma ++LIBS := $(LIBS) -llzma endif ifeq ($(USELZO), on) @@ -96,13 +96,16 @@ index 1fdb628..5dce589 100644 endif ifeq ($(USESNAPPY), on) - LIBS := -lsnappy $(LIBS) +@@ -65,7 +66,7 @@ LIBS := -lsnappy $(LIBS) + ifneq ($(LINKTYPE), dynamic) + LIBS := $(LIBS) -lstdc++ + endif -CFLAGS += -DUSESNAPPY +CFLAGS_COMMON += -DUSESNAPPY endif LIBS := -lpthread $(LIBS) -@@ -87,14 +88,14 @@ LIBS := $(LIBS) $(call try-run,\ +@@ -90,14 +91,14 @@ LIBS := $(LIBS) $(call try-run,\ all: makedumpfile $(OBJ_PART): $(SRC_PART) @@ -119,7 +122,7 @@ index 1fdb628..5dce589 100644 echo .TH MAKEDUMPFILE 8 \"$(DATE)\" \"makedumpfile v$(VERSION)\" \"Linux System Administrator\'s Manual\" > temp.8 grep -v "^.TH MAKEDUMPFILE 8" $(VPATH)makedumpfile.8 >> temp.8 mv temp.8 makedumpfile.8 -@@ -105,7 +106,7 @@ makedumpfile: $(SRC_BASE) $(OBJ_PART) $(OBJ_ARCH) +@@ -108,7 +109,7 @@ makedumpfile: $(SRC_BASE) $(OBJ_PART) $( gzip -c ./makedumpfile.conf.5 > ./makedumpfile.conf.5.gz eppic_makedumpfile.so: extension_eppic.c @@ -128,6 +131,3 @@ index 1fdb628..5dce589 100644 clean: rm -f $(OBJ) $(OBJ_PART) $(OBJ_ARCH) makedumpfile makedumpfile.8.gz makedumpfile.conf.5.gz --- -2.21.0 - diff --git a/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch b/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch index 1707df3e3..85d883365 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch +++ b/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile/0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch @@ -28,11 +28,11 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com> arch/ppc64.c | 38 ++------------------------------------ 1 file changed, 2 insertions(+), 36 deletions(-) -diff --git a/arch/ppc64.c b/arch/ppc64.c -index 9d8f252..6f4860f 100644 ---- a/arch/ppc64.c -+++ b/arch/ppc64.c -@@ -462,48 +462,14 @@ ppc64_vtop_level4(unsigned long vaddr) +Index: git/arch/ppc64.c +=================================================================== +--- git.orig/arch/ppc64.c ++++ git/arch/ppc64.c +@@ -462,44 +462,6 @@ ppc64_vtop_level4(unsigned long vaddr) return paddr; } @@ -40,6 +40,13 @@ index 9d8f252..6f4860f 100644 -set_ppc64_max_physmem_bits(void) -{ - long array_len = ARRAY_LENGTH(mem_section); +- +- /* Check if we can get MAX_PHYSMEM_BITS from vmcoreinfo */ +- if (NUMBER(MAX_PHYSMEM_BITS) != NOT_FOUND_NUMBER) { +- info->max_physmem_bits = NUMBER(MAX_PHYSMEM_BITS); +- return TRUE; +- } +- - /* - * The older ppc64 kernels uses _MAX_PHYSMEM_BITS as 42 and the - * newer kernels 3.7 onwards uses 46 bits. @@ -67,10 +74,10 @@ index 9d8f252..6f4860f 100644 - - return FALSE; -} -- + int get_machdep_info_ppc64(void) - { +@@ -507,10 +469,8 @@ get_machdep_info_ppc64(void) unsigned long vmlist, vmap_area_list, vmalloc_start; info->section_size_bits = _SECTION_SIZE_BITS; @@ -83,6 +90,3 @@ index 9d8f252..6f4860f 100644 info->page_offset = __PAGE_OFFSET; if (SYMBOL(_stext) == NOT_FOUND_SYMBOL) { --- -2.21.0 - diff --git a/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.7.bb b/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.8.bb index 165e192cb..475465124 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.7.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/makedumpfile/makedumpfile_1.6.8.bb @@ -5,12 +5,15 @@ DESCRIPTION = "\ images without extra uneeded information (zero pages, userspace programs, \ etc). \ " -HOMEPAGE = "http://makedumpfile.sourceforge.net" +HOMEPAGE = "https://github.com/makedumpfile/makedumpfile" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" LICENSE = "GPLv2.0" -DEPENDS = "bzip2 zlib elfutils" +SRCBRANCH ?= "master" +SRCREV = "18e0cdba48feeccea2429b3b0b2691f4314d1062" + +DEPENDS = "bzip2 zlib elfutils xz" RDEPENDS_${PN}-tools = "perl ${PN}" # arm and aarch64 would compile but has never been tested upstream. mips would not compile. @@ -21,16 +24,14 @@ PACKAGES =+ "${PN}-tools" FILES_${PN}-tools = "${bindir}/*.pl" SRC_URI = "\ - ${SOURCEFORGE_MIRROR}/makedumpfile/${BPN}-${PV}.tar.gz \ + git://github.com/makedumpfile/makedumpfile;branch=${SRCBRANCH} \ file://0001-makedumpfile-replace-hardcode-CFLAGS.patch \ file://0002-mem_section-Support-only-46-bit-for-MAX_PHYSMEM_BITS.patch \ - file://0001-PATCH-Remove-duplicated-variable-definitions.patch \ " -SRC_URI[md5sum] = "808ef840ca49ca6bfde77c097cf429f5" -SRC_URI[sha256sum] = "e702fbdf62b4cd829a76e46f3e24eb3fc7501918b85ebdcd8baef4f53d6ee2c8" -UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/makedumpfile/files/makedumpfile/" -UPSTREAM_CHECK_REGEX = "makedumpfile/(?P<pver>\d+(\.\d+)+)/" +S = "${WORKDIR}/git" + +UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" SECTION = "base" @@ -40,8 +41,13 @@ SECTION = "base" EXTRA_OEMAKE = "\ LINKTYPE=static \ TARGET=${TARGET_ARCH} \ + ${PACKAGECONFIG_CONFARGS} \ " +PACKAGECONFIG ??= "" +PACKAGECONFIG[lzo] = "USELZO=on,USELZO=off,lzo" +PACKAGECONFIG[snappy] = "USESNAPPY=on,USESNAPPY=off,snappy" + do_install () { mkdir -p ${D}/usr/bin install -m 755 ${S}/makedumpfile ${D}/usr/bin |