Update rpm spec

- Got rid of all rpmlint errors and incoporated feedback from other Fedora BZ reviews. - Added %optflags and %_smp_mflags compile options. - Fixed permissions of fw_header.h - Removed undefined macros from cli and monitor man pages. - Fixed parallel make issue. Signed-off-by: Namratha Kothapalli <[email protected]>
intel · Jul 13, 2016 · b848971 · b848971
1 parent fa50a38
commit b848971
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 56 deletions.
diff --git a/README.md b/README.md
@@ -2,15 +2,15 @@
 
 ixpdimm_sw contains the following interface components:
 
-An Application Program Interface (API) library which provides programatic access to 
+An Application Program Interface (API) library which provides programatic access to
 the IXPDIMM SW functionality.
 
 A Command Line Interface (CLI) application for configuring and managing IXPDIMMs from the
 command line.
 
 A Common Information Model (CIM) provider library to expose the
-IXPDIMM SW functionality as standard CIM objects to plug-in to 
-common information model object managers (CIMOMs). 
+IXPDIMM SW functionality as standard CIM objects to plug-in to
+common information model object managers (CIMOMs).
 
 A monitor daemon/system service for monitoring the health and status of IXPDIMMs.
 
@@ -60,11 +60,11 @@ Kernel 4.3 or newer is suggested, a prebuilt fedora 4.3 kernel can be found at
 
 https://kojipkgs.fedoraproject.org/packages/kernel/4.3.0/1.fc24/x86_64/
 
-libndctl is required to build, an rpm can be found at. 
+libndctl is required to build, an rpm can be found at.
 
 https://copr.fedoraproject.org/coprs/djbw/ndctl/
 
-and the source can be found at 
+and the source can be found at
 
 https://github.com/pmem/ndctl
 

diff --git a/external/fw_headers/fw_header.h b/external/fw_headers/fw_header.h
diff --git a/install/linux/rel-release/ixpdimm_sw.spec b/install/linux/rel-release/ixpdimm_sw.spec
@@ -10,6 +10,9 @@ Group: Applications/System
 URL: https://01.org/ixpdimm-sw
 Source: https://github.com/01org/ixpdimm_sw/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Requires: ndctl-libs >= 51
+Requires: libinvm-i18n >= 1.0.0.1015
+Requires: libinvm-cli >= 1.0.0.1095
+Requires: libinvm-cim >= 1.0.0.1040
 
 BuildRequires: pkgconfig(libctemplate)
 BuildRequires: pkgconfig(libkmod)
@@ -53,9 +56,9 @@ Requires(pre):  pywbem
 Requires(post): pywbem
 
 %description -n libixpdimm-cim
-A Common Information Model (CIM) provider library to expose the IXPDIMM SW 
+A Common Information Model (CIM) provider library to expose the IXPDIMM SW
 functionality as standard CIM objects to plug-in to common information
-model object managers (CIMOMs). 
+model object managers (CIMOMs).
 
 %package -n ixpdimm-monitor
 Summary:        Daemon for monitoring the status of IXPDIMM
@@ -81,7 +84,7 @@ managing IXPDIMMs from the command line.
 %setup -q -n %{name}-%{version}
 
 %build
-make BUILDNUM=%{build_version} RELEASE=1 DATADIR=%{_sharedstatedir} LINUX_PRODUCT_NAME=%{name}
+make BUILDNUM=%{build_version} RELEASE=1 DATADIR=%{_sharedstatedir} LINUX_PRODUCT_NAME=%{name} CFLAGS_EXTERNAL="%{?optflags}" %{?_smp_mflags}
 
 %install
 make install RELEASE=1 RPM_ROOT=%{buildroot} LIB_DIR=%{_libdir} INCLUDE_DIR=%{_includedir} BIN_DIR=%{_bindir} DATADIR=%{_sharedstatedir} UNIT_DIR=%{_unitdir} LINUX_PRODUCT_NAME=%{name} SYSCONF_DIR=%{_sysconfdir} MANPAGE_DIR=%{_mandir}
@@ -113,7 +116,7 @@ then
                 $CIMMOF -uc -n$ns %{_sharedstatedir}/%{name}/Pegasus/mof/pegasus_register.mof &> /dev/null
                 $CIMMOF -uc -n$ns %{_sharedstatedir}/%{name}/Pegasus/mof/profile_registration.mof &> /dev/null
                 break
-           fi 
+           fi
        done
        $CIMMOF -aE -uc -n root/intelwbem %{_sharedstatedir}/%{name}/Pegasus/mof/intelwbem.mof &> /dev/null
 fi
@@ -141,7 +144,8 @@ fi
 /bin/systemctl --no-reload enable ixpdimm-monitor.service &> /dev/null || :
 /bin/systemctl start ixpdimm-monitor.service &> /dev/null || :
 
-%post -p /sbin/ldconfig
+%post -n ixpdimm_sw -p /sbin/ldconfig
+%postun -n ixpdimm_sw -p /sbin/ldconfig
 
 %postun -n libixpdimm-core -p /sbin/ldconfig
 %postun -n libixpdimm-cim -p /sbin/ldconfig
@@ -236,12 +240,14 @@ fi
 
 %files -n libixpdimm-core
 %doc README.md
-%{_libdir}/libixpdimm-core.so*
+%{_libdir}/libixpdimm-core.so.01
+%{_libdir}/libixpdimm-core.so.01.00.0
 %license LICENSE
 
 %files -n libixpdimm-cim
 %doc README.md
-%{_libdir}/cmpi/libixpdimm-cim.so*
+%{_libdir}/cmpi/libixpdimm-cim.so.01
+%{_libdir}/cmpi/libixpdimm-cim.so.01.00.0
 %dir %{_sharedstatedir}/%{name}/Pegasus
 %dir %{_sharedstatedir}/%{name}/Pegasus/mof
 %dir %{_sharedstatedir}/%{name}/sfcb
@@ -259,10 +265,11 @@ fi
 
 %files -n ixpdimm-cli
 %{_bindir}/ixpdimm-cli
-%{_libdir}/libixpdimm-cli.so*
+%{_libdir}/libixpdimm-cli.so.01
+%{_libdir}/libixpdimm-cli.so.01.00.0
 %license LICENSE
 %{_mandir}/man8/ixpdimm-cli*
 
 %changelog
-* Thu Dec 24 2015 Nicholas Moulin <[email protected]> - 01.00.00.2094-1
+* Thu Dec 24 2015 Nicholas Moulin <[email protected]> - 01.00.00.2095-1
 - Initial rpm release
diff --git a/install/linux/sle-release/ixpdimm_sw.spec b/install/linux/sle-release/ixpdimm_sw.spec
@@ -12,19 +12,18 @@
 Name: %{product_name}
 Version: %{build_version}
 Release: %{build_release}%{?dist}
-Summary: API for development of %{product_base_name} management utilities
+Summary: API for development of IXPDIMM management utilities
 License: BSD
 Group: Applications/System
 URL: https://01.org/ixpdimm-sw
-Source: https://github.com/01org/IXPDIMMSW/archive/v%{version}.tar.gz
+Source: https://github.com/01org/ixpdimm_sw/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Requires: libndctl6 >= 51
 
 %define  debug_package %{nil}
 
 %description
-An application program interface (API) for configuring and managing
-%{product_base_name}. Including basic inventory, capacity provisioning,
-health monitoring, and troubleshooting.
+An application program interface (API) which provides programmatic access to
+the IXPSIMM SW functionality.
 
 %package -n %dname
 Summary:        Development files for %{name}
@@ -34,7 +33,7 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 %description -n %dname
 The %{dname} package contains header files for
-developing applications that use %{product_base_name}.
+developing applications that use IXPDIMM SW.
 
 %package -n %corename
 Summary:        Development files for %{name}
@@ -44,10 +43,10 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 %description -n %corename
 The %{corename} package contains libraries that support
-other %{product_name} products.
+other IXPDIMM SW products.
 
 %package -n %cimlibs
-Summary:        CIM provider for %{name}
+Summary:        CIM provider library for IXPDIMM SW
 
 License:        BSD
 Group:          Development/Libraries
@@ -57,31 +56,30 @@ Requires(pre):  pywbem
 Requires(post): pywbem
 
 %description -n %cimlibs
-%{cimlibs} is a common information model (CIM) provider that exposes
-%{product_base_name} as standard CIM objects in order to plug-in to various
-common information model object managers (CIMOMS).
+A Common Information Model (CIM) provider library to expose the IXPDIMM SW
+functionality as standard CIM objects to plug-in to common information
+model object managers (CIMOMs).
 
 %package -n %monitorname
-Summary:        Daemon for monitoring the status of %{product_base_name}
+Summary:        Daemon for monitoring the status of IXPDIMM
 License:        BSD
 Group:          System Environment/Daemons
 Requires:       %{cimlibs}%{?_isa} = %{version}-%{release}
 BuildRequires:  systemd-rpm-macros
 %{?systemd_requires}
 
 %description -n %monitorname
-A daemon for monitoring the health and status of %{product_base_name}
+A monitor daemon for monitoring the health and status of IXPDIMMs.
 
 %package -n %cliname
-Summary:        CLI for managment of %{product_base_name}
+Summary:        CLI for managment of IXPDIMM
 License:        BSD
 Group:          Development/Tools
 Requires:       %{cimlibs}%{?_isa} = %{version}-%{release}
 
 %description -n %cliname
-A command line interface (CLI) application for configuring and
-managing %{product_base_name}. Including commands for basic inventory,
-capacity provisioning, health monitoring, and troubleshooting.
+A Command Line Interface (CLI) application for configuring and
+managing IXPDIMMs from the command line.
 
 %prep
 %setup -q -n %{product_name}-%{version}

diff --git a/scripts/ixpdimm-cli.manpage.footer b/scripts/ixpdimm-cli.manpage.footer
@@ -1,5 +1,4 @@
 
-." -------------------- O P T I O N S --------------------
 OPTIONS
 .B -all|-a
 .br
@@ -27,11 +26,10 @@ Display help for the command.
 .RS
 Change the output format. One of: "text" (default) or "nvmxml".
 .RE
-
 
-." -------------------- E X I T  C O D E S --------------------
+
 EXIT CODES
-.TP 
+.TP
 .B 0
 The operation succeeded.
 .TP
@@ -43,9 +41,7 @@ There was not enough memory to complete the requested operation.
 .TP
 .B 3
 The command is not supported in the current context.
-
 
-." -------------------- E X A M P L E --------------------
 EXAMPLE
 .B **cliName** show -dimm
 .RS
@@ -106,17 +102,14 @@ Show all attributes for the specified namespace
 Create a 1 GB Storage namespace on pool 12345678-1234-1234-1234-123456789012 with a block size of 512
 .RE
 
-." -------------------- F I L E S --------------------
 FILES
 /usr/share/nvdimm-mgmt/apss.dat
 .br
 /usr/share/nvdimm-mgmt/public.rev0.pem
 
 
-." -------------------- S E E  A L S O --------------------
 SEE ALSO
 **serviceName** (8)
 
-." -------------------- A U T H O R --------------------
 AUTHOR
 Created by Intel Corporation.
diff --git a/scripts/ixpdimm-cli.manpage.header b/scripts/ixpdimm-cli.manpage.header
@@ -1,11 +1,9 @@
 
-." -------------------- N A M E --------------------
 NAME
 **cliName** - CLI to manage **fullProductName**s
 
-." -------------------- S Y N O P S I S --------------------
 SYNOPSIS
-.B **cliName** 
+.B **cliName**
 <verb> [<options>] [<targets>] [<properties>]
 
 .P
@@ -53,7 +51,6 @@ properties
 Finally, zero or more properties defined as a key/value pair can be used to modify the target.
 .RE
 
-." -------------------- D E S C R I P T I O N --------------------
 DESCRIPTION
 
 Command line access to **abbrProductName** Management functionality is available through the **cliName** component. The NVMCLI exposes all available management features of the underlying **abbrProductName**. The Command Line Interface is an end-user, manufacturing and validation utility.

diff --git a/scripts/ixpdimm-monitor.manpage.text b/scripts/ixpdimm-monitor.manpage.text
@@ -1,46 +1,38 @@
 
-." -------------------- N A M E --------------------
 NAME
 **serviceName** - Daemon to monitor **fullProductName** management events.  Used by **cliName**.
 
-." -------------------- S Y N O P S I S --------------------
 SYNOPSIS
-.B **serviceName** 
+.B **serviceName**
 .RB [ -d ]
 
-." -------------------- D E S C R I P T I O N --------------------
 DESCRIPTION
 
 Daemon to monitor **fullProductName** management events.  These events can be viewed using **cliName**.
 
-." -------------------- O P T I O N S --------------------
 OPTION
 .TP
 .B -d
-Starts 
+Starts
 .B **serviceName**
 as a background daemon.
 
-." -------------------- E X I T  C O D E S --------------------
 EXIT CODES
- 
+
 .TP
 .B 0
 The operation succeeded.
 .TP
 .B 1
 An error occurred.
 
-." -------------------- F I L E S --------------------
 FILES
 **dataPath**/apss.dat
 .br
 /var/run/**serviceName**.pid
 
-." -------------------- S E E  A L S O --------------------
 SEE ALSO
 **cliName** (8)
 
-." -------------------- A U T H O R --------------------
 AUTHOR
 Created by Intel Corporation.
diff --git a/src/common/makefile b/src/common/makefile
@@ -145,9 +145,11 @@ dependencies:
 $(TARGETNAME) : $(SUBMODULE_OBJS) $(OBJECT_MODULE_DIR)/encrypt/encrypt.o $(INDEPENDENT_SUBMODULE_OBJS)
 	$(AR) rcs $@ $^
 
-$(SUBMODULE_DIRS) :
+$(SUBMODULE_DIRS) : $(BUILD_DIR)/$(PUBLIC_KEY_NAME)
 	$(MKDIR) $@
 	$(MKDIR) $(OBJECT_MODULE_DIR)/encrypt
+
+$(BUILD_DIR)/$(PUBLIC_KEY_NAME) :
 	$(COPY) $(SRC_DIR)/common/encrypt/$(PUBLIC_KEY_NAME) $(BUILD_DIR)
 
 # suffix rule for .c -> .o