diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:28:33 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:31:28 +0300 |
commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /poky/meta/recipes-devtools/libcomps | |
parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
download | openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.xz |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-devtools/libcomps')
-rw-r--r-- | poky/meta/recipes-devtools/libcomps/libcomps/0001-Add-crc32.c-to-sources-list.patch | 47 | ||||
-rw-r--r-- | poky/meta/recipes-devtools/libcomps/libcomps_git.bb | 5 |
2 files changed, 50 insertions, 2 deletions
diff --git a/poky/meta/recipes-devtools/libcomps/libcomps/0001-Add-crc32.c-to-sources-list.patch b/poky/meta/recipes-devtools/libcomps/libcomps/0001-Add-crc32.c-to-sources-list.patch new file mode 100644 index 0000000000..ff90269a23 --- /dev/null +++ b/poky/meta/recipes-devtools/libcomps/libcomps/0001-Add-crc32.c-to-sources-list.patch @@ -0,0 +1,47 @@ +From 83407aa50e06d967d0a1095a140bd7b0e5d51d27 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Wed, 21 Nov 2018 13:09:05 +0100 +Subject: [PATCH] Add crc32.c to sources list + +Otherwise, there is a missing symbol runtime error under musl C library. + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + libcomps/src/python/src/CMakeLists.txt | 4 ++-- + libcomps/src/python/src/crc32.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/libcomps/src/python/src/CMakeLists.txt b/libcomps/src/python/src/CMakeLists.txt +index 6ed25bb..c15c8b2 100644 +--- a/libcomps/src/python/src/CMakeLists.txt ++++ b/libcomps/src/python/src/CMakeLists.txt +@@ -9,13 +9,13 @@ set (pycomps_SRCDIR ${CMAKE_CURRENT_SOURCE_DIR}) + set (pycomps_SRC pycomps.c pycomps_sequence.c + pycomps_envs.c pycomps_categories.c pycomps_groups.c + pycomps_gids.c pycomps_utils.c pycomps_dict.c pycomps_mdict.c +- pycomps_hash.c pycomps_exc.c pycomps_lbw.c) ++ pycomps_hash.c pycomps_exc.c pycomps_lbw.c crc32.c) + + set (pycomps_HEADERS pycomps_23macros.h pycomps_sequence.h + pycomps_envs.h pycomps_categories.h pycomps_groups.h + pycomps_gids.h pycomps_utils.h pycomps_dict.h pycomps_mdict.h + pycomps_hash.h pycomps_exc.h pycomps_lbw.h +- pycomps_types.h) ++ pycomps_types.h crc32.h) + + #set(TEST_FILES ../__init__.py __test.py test_merge_comps.py test_libcomps.py + # utest.py) +diff --git a/libcomps/src/python/src/crc32.c b/libcomps/src/python/src/crc32.c +index d8f5e34..f266067 100644 +--- a/libcomps/src/python/src/crc32.c ++++ b/libcomps/src/python/src/crc32.c +@@ -41,7 +41,7 @@ + */ + + #include <sys/param.h> +-#include <sys/systm.h> ++#include <stdint.h> + + static uint32_t crc32_tab[] = { + 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, diff --git a/poky/meta/recipes-devtools/libcomps/libcomps_git.bb b/poky/meta/recipes-devtools/libcomps/libcomps_git.bb index e69bf67729..ff6820851f 100644 --- a/poky/meta/recipes-devtools/libcomps/libcomps_git.bb +++ b/poky/meta/recipes-devtools/libcomps/libcomps_git.bb @@ -6,10 +6,11 @@ SRC_URI = "git://github.com/rpm-software-management/libcomps.git \ file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ file://0002-Set-library-installation-path-correctly.patch \ file://0001-Make-__comps_objmrtree_all-static-inline.patch \ + file://0001-Add-crc32.c-to-sources-list.patch \ " -PV = "0.1.8+git${SRCPV}" -SRCREV = "01a4759894cccff64d2561614a58281adf5ce859" +PV = "0.1.10" +SRCREV = "86a82fcd155c27092340d15a34f5c75c4da88243" S = "${WORKDIR}/git" |