summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2021-11-27 10:53:48 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-11-29 23:07:13 +0000
commit2588acf1295a71ca08b1cedcb6c1b2394545e122 (patch)
treea364a44314b74ef30ff0465ee0419e313df11870
parent5c95402ff95e992de5c7f05a1e4cc6bcfdbfd8df (diff)
downloadpoky-2588acf1295a71ca08b1cedcb6c1b2394545e122.tar.gz
libcomps: remove unneeded patch
Somewhere along the way the issue was fixed upstream. (From OE-Core rev: 8a5e34ff78fc74bce16b7aae173f047fce88dee5) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/libcomps/libcomps/0001-Add-crc32.c-to-sources-list.patch50
-rw-r--r--meta/recipes-devtools/libcomps/libcomps_0.1.18.bb1
2 files changed, 0 insertions, 51 deletions
diff --git a/meta/recipes-devtools/libcomps/libcomps/0001-Add-crc32.c-to-sources-list.patch b/meta/recipes-devtools/libcomps/libcomps/0001-Add-crc32.c-to-sources-list.patch
deleted file mode 100644
index 76fce19767..0000000000
--- a/meta/recipes-devtools/libcomps/libcomps/0001-Add-crc32.c-to-sources-list.patch
+++ /dev/null
@@ -1,50 +0,0 @@
1From 72065bb2b5881dc224299f302379391aebdfca3d Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 21 Nov 2018 13:09:05 +0100
4Subject: [PATCH 1/2] Add crc32.c to sources list
5
6Otherwise, there is a missing symbol runtime error under musl C library.
7
8Upstream-Status: Pending
9Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
10---
11 libcomps/src/python/src/CMakeLists.txt | 4 ++--
12 libcomps/src/python/src/crc32.c | 2 +-
13 2 files changed, 3 insertions(+), 3 deletions(-)
14
15diff --git a/libcomps/src/python/src/CMakeLists.txt b/libcomps/src/python/src/CMakeLists.txt
16index 89b9c91..08cd6b5 100644
17--- a/libcomps/src/python/src/CMakeLists.txt
18+++ b/libcomps/src/python/src/CMakeLists.txt
19@@ -9,13 +9,13 @@ set (pycomps_SRCDIR ${CMAKE_CURRENT_SOURCE_DIR})
20 set (pycomps_SRC pycomps.c pycomps_sequence.c
21 pycomps_envs.c pycomps_categories.c pycomps_groups.c
22 pycomps_gids.c pycomps_utils.c pycomps_dict.c pycomps_mdict.c
23- pycomps_hash.c pycomps_exc.c pycomps_lbw.c)
24+ pycomps_hash.c pycomps_exc.c pycomps_lbw.c crc32.c)
25
26 set (pycomps_HEADERS pycomps_macros.h pycomps_sequence.h
27 pycomps_envs.h pycomps_categories.h pycomps_groups.h
28 pycomps_gids.h pycomps_utils.h pycomps_dict.h pycomps_mdict.h
29 pycomps_hash.h pycomps_exc.h pycomps_lbw.h
30- pycomps_types.h)
31+ pycomps_types.h crc32.h)
32
33 #set(TEST_FILES ../__init__.py __test.py test_merge_comps.py test_libcomps.py
34 # utest.py)
35diff --git a/libcomps/src/python/src/crc32.c b/libcomps/src/python/src/crc32.c
36index d8f5e34..f266067 100644
37--- a/libcomps/src/python/src/crc32.c
38+++ b/libcomps/src/python/src/crc32.c
39@@ -41,7 +41,7 @@
40 */
41
42 #include <sys/param.h>
43-#include <sys/systm.h>
44+#include <stdint.h>
45
46 static uint32_t crc32_tab[] = {
47 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,
48--
492.25.1
50
diff --git a/meta/recipes-devtools/libcomps/libcomps_0.1.18.bb b/meta/recipes-devtools/libcomps/libcomps_0.1.18.bb
index 3fd4d5b83d..ff6ecc7601 100644
--- a/meta/recipes-devtools/libcomps/libcomps_0.1.18.bb
+++ b/meta/recipes-devtools/libcomps/libcomps_0.1.18.bb
@@ -5,7 +5,6 @@ LICENSE = "GPLv2"
5LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" 5LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
6 6
7SRC_URI = "git://github.com/rpm-software-management/libcomps.git;branch=master;protocol=https \ 7SRC_URI = "git://github.com/rpm-software-management/libcomps.git;branch=master;protocol=https \
8 file://0001-Add-crc32.c-to-sources-list.patch \
9 file://0002-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ 8 file://0002-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \
10 " 9 "
11 10