Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
9a08f24e48
!11 [sync] PR-10: 增加riscv支持并使能%check
From: @openeuler-sync-bot 
Reviewed-by: @licunlong 
Signed-off-by: @licunlong
2023-03-01 03:21:13 +00:00
laokz
a98b4c7a06 add riscv64 and enable %check
(cherry picked from commit 445a33a041fe2ea1982de31d0589009942950b48)
2023-03-01 09:25:31 +08:00
openeuler-ci-bot
a883d82478
!8 [sync] PR-7: fix build error for loongarch64
From: @openeuler-sync-bot 
Reviewed-by: @licunlong 
Signed-off-by: @licunlong
2023-01-12 02:55:11 +00:00
Jingyun Hua
cd9c1f10c7 fix build error for loongarch64
Signed-off-by: Jingyun Hua <huajingyun@loongson.cn>
(cherry picked from commit d61ee16e90e283fe8d21eb56d0f14af27af5fc43)
2023-01-12 09:07:57 +08:00
openeuler-ci-bot
893b78956d
!5 remove redundant macros
From: @zhangruifang2020 
Reviewed-by: @licunlong 
Signed-off-by: @licunlong
2022-10-19 09:15:21 +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
openeuler-ci-bot
b9a4f22a94 !1 add yaml file
Merge pull request !1 from linwei9/master
2020-07-20 15:11:41 +08:00
linwei9
c51e0c7f48 add yaml file 2020-06-18 17:43:12 +08:00
4 changed files with 60 additions and 30 deletions

View File

@ -0,0 +1,26 @@
From c8376fb7589920ab9fcb1daafc6166af7c7f21a7 Mon Sep 17 00:00:00 2001
From: Jingyun Hua <huajingyun@loongson.cn>
Date: Wed, 11 Jan 2023 16:43:06 +0800
Subject: [PATCH] fix build error for loongarch64
Signed-off-by: Jingyun Hua <huajingyun@loongson.cn>
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index c98cf35..f966afd 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

@ -1,18 +1,20 @@
Name: isomd5sum
Version: 1.2.3
Release: 4
Release: 8
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
Patch1: fix-build-error-for-loongarch64.patch
Patch2: fix-build-error-for-riscv64.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 +27,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 +39,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 +60,6 @@ popd
%{_libdir}/*.a
%{_datadir}/pkgconfig/isomd5sum.pc
%files -n python2-isomd5sum
%{python2_sitearch}/*.so
%files -n python3-isomd5sum
%{python3_sitearch}/*.so
@ -91,5 +67,18 @@ popd
%{_mandir}/man1/*
%changelog
* Mon Feb 20 2023 laokz <zhangkai@iscas.ac.cn> - 1:1.2.3-8
- fix build error for riscv64
- add %check
* Wed Jan 11 2023 huajingyun <huajingyun@loongson.cn> - 1:1.2.3-7
- fix build error for loongarch64
* 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

4
isomd5sum.yaml Normal file
View File

@ -0,0 +1,4 @@
version_control: github
src_repo: rhinstaller/isomd5sum
tag_prefix:
seperator: