Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
1d2d40a00d
!19 [sync] PR-17: Add sw_64 support
From: @openeuler-sync-bot 
Reviewed-by: @dillon_chen 
Signed-off-by: @dillon_chen
2025-03-06 05:56:36 +00:00
maqi
31a05ec1e0 Add sw_64 support
(cherry picked from commit 38f9235fd62e967fab8bd4ddfda072759ccb9266)
2025-03-05 13:53:43 +08:00
openeuler-ci-bot
9fb7126b6e
!14 [手工sync] PR-10: 增加riscv支持并使能%check
From: @laokz 
Reviewed-by: @overweight 
Signed-off-by: @overweight
2023-03-20 01:50:55 +00:00
laokz
b56332ba11 fix riscv64 build and enable test 2023-03-16 16:53:52 +08:00
openeuler-ci-bot
32aab5bc83
!13 添加loongarch64支持
From: @streamlet_hy 
Reviewed-by: @overweight 
Signed-off-by: @overweight
2023-03-16 01:30:59 +00:00
Huang Yang
421cfdc511 add loongarch64 support 2023-03-08 09:23:21 +08:00
openeuler-ci-bot
285583a2f5
!6 remove redundant macros
From: @zhangruifang2020 
Reviewed-by: @licunlong 
Signed-off-by: @licunlong
2022-10-19 09:15:42 +00:00
zhangruifang2020
fde92e9f01 remove redundant macros 2022-10-19 15:16:21 +08:00
openeuler-ci-bot
6ed81b1af9 !2 Remove python2
From: @wangchen2020
Reviewed-by: @overweight
Signed-off-by: @overweight
2020-10-30 10:17:30 +08:00
wangchen2020
ce6f569af8 Remove python2 2020-10-29 10:14:19 +08:00
4 changed files with 85 additions and 30 deletions

View File

@ -0,0 +1,25 @@
From 42ebb67d30d95ace5d9f4caa43320001dd6c7c35 Mon Sep 17 00:00:00 2001
From: Huang Yang <huangyang@loongson.cn>
Date: Tue, 7 Mar 2023 09:36:05 +0800
Subject: [PATCH] add loongarch64 support
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index c98cf35..346e028 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ PYTHONINCLUDE := $(shell $(PYTHON)-config --includes)
VERSION=1.2.3
-ifneq (,$(filter sparc64 ppc64 ppc64le x86_64 s390x aarch64,$(shell uname -m)))
+ifneq (,$(filter sparc64 ppc64 ppc64le x86_64 s390x aarch64 loongarch64,$(shell uname -m)))
LIBDIR = lib64
else
LIBDIR = lib
--
2.33.0

View File

@ -0,0 +1,11 @@
--- isomd5sum-1.2.3/Makefile 2018-04-11 01:30:32.000000000 +0800
+++ isomd5sum-1.2.3/Makefile.new 2023-02-18 19:45:13.543992122 +0800
@@ -4,7 +4,7 @@
VERSION=1.2.3
-ifneq (,$(filter sparc64 ppc64 ppc64le x86_64 s390x aarch64 loongarch64,$(shell uname -m)))
+ifneq (,$(filter sparc64 ppc64 ppc64le x86_64 s390x aarch64 loongarch64 riscv64,$(shell uname -m)))
LIBDIR = lib64
else
LIBDIR = lib

View File

@ -0,0 +1,25 @@
From 870e7c48c64897522b7368ae2fa283d6387890c5 Mon Sep 17 00:00:00 2001
From: maqi <maqi@uniontech.com>
Date: Mon, 3 Mar 2025 15:24:22 +0800
Subject: [PATCH] fix sw_64 build error
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 208393c..6f532ed 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ PYTHONINCLUDE := $(shell $(PYTHON)-config --includes)
VERSION=1.2.3
-ifneq (,$(filter sparc64 ppc64 ppc64le x86_64 s390x aarch64 loongarch64 riscv64,$(shell uname -m)))
+ifneq (,$(filter sparc64 ppc64 ppc64le x86_64 s390x aarch64 loongarch64 riscv64 sw_64,$(shell uname -m)))
LIBDIR = lib64
else
LIBDIR = lib
--
2.39.3

View File

@ -1,18 +1,22 @@
Name: isomd5sum
Version: 1.2.3
Release: 4
Release: 9
Epoch: 1
Summary: Utilities for working with md5sum implanted in ISO images
License: GPLv2+
URL: https://github.com/rhinstaller/isomd5sum
Source0: https://github.com/rhinstaller/%{name}/archive/%{version}.tar.gz
Patch0001: 0001-isomd5sum-1.2.3-add-loongarch64-support.patch
Patch0002: 0002-fix-build-error-for-riscv64.patch
Patch0003: 0003-fix-sw_64-build-error.patch
%global common_description %{expand:
isomd5sum provides a way of making use of the ISO9660 application data
area to store md5sum data about the iso. This allows you to check the
iso given nothing more than the iso itself.}
BuildRequires: gcc popt-devel python2-devel python3-devel
BuildRequires: gcc popt-devel python3-devel genisoimage
%description
%{common_description}
@ -25,13 +29,6 @@ Provides: %{name}-static = %{epoch}:%{version}-%{release}
%description devel
Development headers and libraries for %{name}
%package -n python2-isomd5sum
Summary: Python2 bindings for isomd5sum
%{?python_provide:%python_provide python2-isomd5sum}
%description -n python2-isomd5sum
%{common_description}
%package -n python3-isomd5sum
Summary: Python3 bindings for isomd5sum
%{?python_provide:%python_provide python3-isomd5sum}
@ -44,33 +41,17 @@ Summary: Python3 bindings for isomd5sum
%prep
%autosetup -n %{name}-%{version} -p1
rm -rf %{py3dir}
cp -a . %{py3dir}
%build
CFLAGS="$RPM_OPT_FLAGS -Wno-strict-aliasing"; export CFLAGS
LDFLAGS="$RPM_LD_FLAGS"; export LDFLAGS
PYTHON=%{__python2} make checkisomd5 implantisomd5 pyisomd5sum.so
pushd %{py3dir}
PYTHON=%{__python3} make checkisomd5 implantisomd5 pyisomd5sum.so
popd
%install
PYTHON=%{__python2} make DESTDIR=%{buildroot} install-bin install-devel install-python
pushd %{py3dir}
PYTHON=%{__python3} make DESTDIR=%{buildroot} install-bin install-devel install-python
popd
%pre
%preun
%post
%postun
%check
make test
%files
%license COPYING
@ -81,9 +62,6 @@ popd
%{_libdir}/*.a
%{_datadir}/pkgconfig/isomd5sum.pc
%files -n python2-isomd5sum
%{python2_sitearch}/*.so
%files -n python3-isomd5sum
%{python3_sitearch}/*.so
@ -91,5 +69,21 @@ popd
%{_mandir}/man1/*
%changelog
* Mon Mar 03 2025 maqi <maqi@uniontech.com> - 1:1.2.3-9
- Add sw_64 support
* Thu Mar 16 2023 laokz <zhangkai@iscas.ac.cn> - 1:1.2.3-8
- fix build error for riscv64
- add %check
* Tue Mar 7 2023 HuangYang <huangyang@loongson.cn> - 1:1.2.3-7
- add loongarch64 support
* Wed Oct 19 2022 zhangruifang <zhangruifang1@h-partners.com> - 1:1.2.3-6
- remove redundant macros
* Thu Oct 29 2020 wangchen <wangchen137@huawei.com> - 1:1.2.3-5
- Remove python2
* Mon Oct 14 2019 openEuler Buildteam <buildteam@openeuler.org> - 1:1.2.3-4
- Package init