update source0

(cherry picked from commit 39b4653b0c96b744e28b0eccde9d592231e3bf2f)
This commit is contained in:
Yafen 2024-11-04 18:19:01 +08:00 committed by openeuler-sync-bot
parent 271c78314a
commit fdd8799be4
4 changed files with 17 additions and 8 deletions

View File

@ -1,3 +1,5 @@
diff --git a/overlaycheck/CMakeLists.txt b/overlaycheck/CMakeLists.txt
index 4b775dd..85a0fb6 100644
--- a/overlaycheck/CMakeLists.txt --- a/overlaycheck/CMakeLists.txt
+++ b/overlaycheck/CMakeLists.txt +++ b/overlaycheck/CMakeLists.txt
@@ -7,4 +7,4 @@ project(overlaycheck) @@ -7,4 +7,4 @@ project(overlaycheck)
@ -6,14 +8,17 @@
install(PROGRAMS overlaycheck DESTINATION ${CMAKE_INSTALL_BINDIR}) install(PROGRAMS overlaycheck DESTINATION ${CMAKE_INSTALL_BINDIR})
-install(FILES overlaycheck_exclusions.txt DESTINATION ${CMAKE_INSTALL_BINDIR}) -install(FILES overlaycheck_exclusions.txt DESTINATION ${CMAKE_INSTALL_BINDIR})
+install(FILES overlaycheck_exclusions.txt DESTINATION ${CMAKE_INSTALL_DATADIR}/raspi-utils) +install(FILES overlaycheck_exclusions.txt DESTINATION ${CMAKE_INSTALL_DATADIR}/raspi-utils)
\ No newline at end of file
diff --git a/overlaycheck/overlaycheck b/overlaycheck/overlaycheck
index e799a93..58a72c5 100755
--- a/overlaycheck/overlaycheck --- a/overlaycheck/overlaycheck
+++ b/overlaycheck/overlaycheck +++ b/overlaycheck/overlaycheck
@@ -99,7 +99,7 @@ my @cpp_cmd = ('arm-linux-gnueabihf-cpp' @@ -160,7 +160,7 @@ my @cpp_cmd =
'assembler-with-cpp'); );
my $DTC = "$kerndir/scripts/dtc/dtc"; my $DTC = "$kerndir/scripts/dtc/dtc";
-my $exclusions_file = $0 . "_exclusions.txt"; -my $exclusions_file = $0 . "_exclusions.txt";
+my $exclusions_file = "/usr/share/raspi-utils/overlaycheck_exclusions.txt"; +my $exclusions_file = "/usr/share/raspi-utils/overlaycheck_exclusions.txt";
my @warnings_to_suppress = ('unit_address_vs_reg', my @warnings_to_suppress =
'simple_bus_reg', (
'unit_address_format', 'unit_address_vs_reg',

View File

@ -1,11 +1,11 @@
%global _completions_dir /usr/share/bash-completion/completions %global _completions_dir /usr/share/bash-completion/completions
%global _usrshare_dir /usr/share/raspi-utils %global _usrshare_dir /usr/share/raspi-utils
%global commitid 6b669633d75d22d45d5218e5af6d7a83db52e42c %global commitid 6a2a6becebbc38fde34a94386457ac8210f9119b
%global debug_package %{nil} %global debug_package %{nil}
Name: raspberrypi-utils Name: raspberrypi-utils
Version: 20240428 Version: 20241104
Release: 1 Release: 2
Summary: Collection of Raspberry Pi utilities (scripts and simple applications) Summary: Collection of Raspberry Pi utilities (scripts and simple applications)
License: BSD-3-Clause License: BSD-3-Clause
URL: https://github.com/raspberrypi/utils URL: https://github.com/raspberrypi/utils
@ -82,5 +82,9 @@ gzip -c vcmailbox/vcmailbox.7 > %{buildroot}%{_mandir}/man7/vcmailbox.7.gz
%{_usrshare_dir}/* %{_usrshare_dir}/*
%changelog %changelog
* Mon Nov 4 2024 Yafen Fang<yafen@iscas.ac.cn> - 20241104-2
- update upstream version to the latest commit: "ovmerge: Disable Perl warnings about portability"
- update patch0002
* Sun Apr 28 2024 Yafen Fang<yafen@iscas.ac.cn> - 20240428-1 * Sun Apr 28 2024 Yafen Fang<yafen@iscas.ac.cn> - 20240428-1
- init package - init package

Binary file not shown.