From ff2bcfc9d795534e81dc8c329ba09cc0ecc89935 Mon Sep 17 00:00:00 2001 From: Jason Tian Date: Fri, 11 Dec 2020 03:39:11 +0100 Subject: [PATCH] Fix problem from make dist-rpm rasdaemon rpm package can't build out and report the files should start from "/". Update the Makefile by adding "" to folder name and change one typo. Signed-off-by: Jason Tian Signed-off-by: Mauro Carvalho Chehab --- Makefile.am | 3 ++- configure.ac | 2 +- misc/rasdaemon.spec.in | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 37a1283..de01098 100644 --- a/Makefile.am +++ b/Makefile.am @@ -62,7 +62,8 @@ rasdaemon_LDADD = -lpthread $(SQLITE3_LIBS) libtrace/libtrace.a include_HEADERS = config.h ras-events.h ras-logger.h ras-mc-handler.h \ ras-aer-handler.h ras-mce-handler.h ras-record.h bitfield.h ras-report.h \ ras-extlog-handler.h ras-arm-handler.h ras-non-standard-handler.h \ - ras-devlink-handler.h ras-diskerror-handler.h rbtree.h ras-page-isolation.h + ras-devlink-handler.h ras-diskerror-handler.h rbtree.h ras-page-isolation.h \ + non-standard-hisilicon.h # This rule can't be called with more than one Makefile job (like make -j8) # I can't figure out a way to fix that diff --git a/configure.ac b/configure.ac index 318b1e6..e276c84 100644 --- a/configure.ac +++ b/configure.ac @@ -152,7 +152,7 @@ AC_SUBST([RASSTATEDIR]) AC_ARG_WITH(sysconfdefdir, AC_HELP_STRING([--with-sysconfdefdir=DIR], [rasdaemon environment file dir]), [SYSCONFDEFDIR=$withval], - [/etc/sysconfig]) + ["/etc/sysconfig"]) AC_SUBST([SYSCONFDEFDIR]) AC_DEFINE([RAS_DB_FNAME], ["ras-mc_event.db"], [ras events database]) diff --git a/misc/rasdaemon.spec.in b/misc/rasdaemon.spec.in index 01e69fc..5f02f2c 100644 --- a/misc/rasdaemon.spec.in +++ b/misc/rasdaemon.spec.in @@ -57,7 +57,7 @@ rm INSTALL %{buildroot}/usr/include/*.h %{_sharedstatedir}/rasdaemon %{_sysconfdir}/ras/dimm_labels.d @SYSCONFDEFDIR@/%{name} -%config(noreplace) @SYSCONFDIFDIR@/%{name} +%config(noreplace) @SYSCONFDEFDIR@/%{name} %changelog -- 2.50.1