dtc.spec

@@ -1,8 +1,8 @@
 %define _wrong_version_format_terminate_build 0
 
 Name:         dtc
-Version:      1.6.1
-Release:      4
+Version:      1.6.0
+Release:      2
 Summary:      Device tree compiler
 License:      GPLv2+
 URL:          https://devicetree.org/
@@ -13,11 +13,6 @@ BuildRequires: python3-devel python3-setuptools
 Provides:      libfdt
 Obsoletes:     libfdt
 
-Patch1:        openEuler-add-secure-compile-option-in-Makefile.patch
-
-%ifarch ppc64le
-Patch2:        fix-secure-compile-option-error-in-Makefile.patch
-%endif
 
 %description
 The devicetree is a data structure for describing hardware. Rather than hard coding
@@ -56,9 +51,6 @@ This package provides python3 bindings for libfdt
 make install DESTDIR=$RPM_BUILD_ROOT PREFIX=$RPM_BUILD_ROOT/usr \
              LIBDIR=%{_libdir} BINDIR=%{_bindir} INCLUDEDIR=%{_includedir} V=1
 
-%check
-%make_build check
-
 %pre
 
 %preun
@@ -86,36 +78,6 @@ make install DESTDIR=$RPM_BUILD_ROOT PREFIX=$RPM_BUILD_ROOT/usr \
 %doc Documentation/manual.txt
 
 %changelog
-* Mon Jul 8 2024 fuanan <yingjun.ni@shingroup.cn> - 1.6.1-4
-- Type: bugfix
-- ID: NA
-- SUG: NA
-- DESC: fix secure compile option error in Makefile
-
-* Thu May 25 2023 fuanan <fuanan3@h-partners.com> - 1.6.1-3
-- Type: bugfix
-- ID: NA
-- SUG: NA
-- DESC: enable make check
-
-* Wed Oct 26 2022 yanglongkang<yanglongkang@h-partners.com> - 1.6.1-2
-- Type: bugfix
-- ID: NA
-- SUG: NA
-- DESC: rebuild for next release
-
-* Sat Nov 27 2021 yangzhuangzhuang<yangzhuangzhuang1@huawei.com> - 1.6.1-1
-- Type:enhancement
-- ID:NA
-- SUG:NA
-- DESC:update version to 1.6.1
-
-* Sat Mar 20 2021 shenyangyang<shenyangyang4@huawei.com> - 1.6.0-3
-- Type:enhancement
-- ID:NA
-- SUG:NA
-- DESC:Add secure compile option in Makefile
-
 * Wed Sep 9 2020 wangchen<wangchen137@huawei.com> - 1.6.0-2
 - Type:enhancement
 - ID:NA

fix-secure-compile-option-error-in-Makefile.patch

@@ -1,30 +0,0 @@
-From 5a190c01ddc7b7f8d8eb44595d2b478582463ae9 Mon Sep 17 00:00:00 2001
-From: Yingjun Ni <yingjun.ni@shingroup.cn>
-Date: Mon, 8 Jul 2024 09:57:55 +0800
-Subject: [PATCH] Fix secure compile option error in Makefile.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-dtc rpm包会生成dtc bin和libfdt.so，-fPIE不作用于libfdt.so，其他应用(如qemu)调用libfdt.so时会出现段错误，使用-fPIC代替-fPIE。
-
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 5b72f66..278692d 100644
---- a/Makefile
-+++ b/Makefile
-@@ -20,7 +20,7 @@ CONFIG_LOCALVERSION =
- # See libfdt_internal.h for details
- ASSUME_MASK ?= 0
- 
--EXTRA_CFLAGS += -D_FORTIFY_SOURCE=2 -fstack-protector-strong -Wl,-z,now -fPIE
-+EXTRA_CFLAGS += -D_FORTIFY_SOURCE=2 -fstack-protector-strong -Wl,-z,now -fPIC
- LDFLAGS += -Wl,-z,now -pie
- CPPFLAGS = -I libfdt -I . -DFDT_ASSUME_MASK=$(ASSUME_MASK)
- WARNINGS = -Wall -Wpointer-arith -Wcast-qual -Wnested-externs \
--- 
-2.33.0
-

openEuler-add-secure-compile-option-in-Makefile.patch

@@ -1,25 +0,0 @@
-From 1c3f9fea2f808ae9eb481bc344ff589b42a106a7 Mon Sep 17 00:00:00 2001
-From: Yangyang Shen <shenyangyang4@huawei.com>
-Date: Sat, 20 Mar 2021 16:40:13 +0800
-Subject: [PATCH] openEuler add secure compile option in Makefile
-
----
- Makefile | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/Makefile b/Makefile
-index f02aa19..a37a2db 100644
---- a/Makefile
-+++ b/Makefile
-@@ -20,6 +20,8 @@ CONFIG_LOCALVERSION =
- # See libfdt_internal.h for details
- ASSUME_MASK ?= 0
- 
-+EXTRA_CFLAGS += -D_FORTIFY_SOURCE=2 -fstack-protector-strong -Wl,-z,now -fPIE
-+LDFLAGS += -Wl,-z,now -pie
- CPPFLAGS = -I libfdt -I . -DFDT_ASSUME_MASK=$(ASSUME_MASK)
- WARNINGS = -Wall -Wpointer-arith -Wcast-qual -Wnested-externs \
- 	-Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Wshadow
--- 
-2.23.0
-