diff options
| -rw-r--r-- | .bzrignore | 1 | ||||
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | misc/dkms-postbuild.sh | 3 | ||||
| -rw-r--r-- | misc/dkms.conf.in | 4 | ||||
| -rw-r--r-- | pcitool.spec.in | 5 | ||||
| -rw-r--r-- | pcitool/buildinfo.c | 2 |
6 files changed, 12 insertions, 5 deletions
@@ -1,3 +1,4 @@ +*.tar.bz2 *.cmd pciDriver.ko pciDriver.mod.c diff --git a/CMakeLists.txt b/CMakeLists.txt index f0edd76..72c50b6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -183,7 +183,7 @@ if (${RELEASE} GREATER 0) else (${RELEASE} GREATER 0) set(CPACK_PACKAGE_VERSION "${PACKAGE_VERSION}") endif (${RELEASE} GREATER 0) -set(CPACK_SOURCE_IGNORE_FILES "/build/;/.bzr/;CMakeFiles;_CPack_Packages;cmake_install.cmake;CPack.*.cmake;CMakeCache.txt;install_manifest.txt;common.mk;config.h$;.pc$;/([^d]|d[^r])[^/]*/Makefile;__pycache__;.pyc$;.tar.bz2$;~$;${CPACK_SOURCE_IGNORE_FILES}") +set(CPACK_SOURCE_IGNORE_FILES "/build/;/.bzr/;CMakeFiles;_CPack_Packages;cmake_install.cmake;CPack.*.cmake;CMakeCache.txt;install_manifest.txt;common.mk;pcilib/config.h$;.pc$;/([^d]|d[^r])[^/]*/Makefile;__pycache__;.pyc$;.tar.bz2$;~$;${CPACK_SOURCE_IGNORE_FILES}") set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION}") include(CPack) diff --git a/misc/dkms-postbuild.sh b/misc/dkms-postbuild.sh new file mode 100644 index 0000000..ae73c1a --- /dev/null +++ b/misc/dkms-postbuild.sh @@ -0,0 +1,3 @@ +#! /bin/bash + +make -C driver/ install_symvers KERNELVER=$kernelver KERNELDIR=$kernel_source_dir diff --git a/misc/dkms.conf.in b/misc/dkms.conf.in index 2e647a9..8b48180 100644 --- a/misc/dkms.conf.in +++ b/misc/dkms.conf.in @@ -1,5 +1,5 @@ -POST_INSTALL="make -C driver/ install_symvers KERNELVER=$kernelver KERNELDIR=$kernel_source_dir" -MAKE="make -C driver/ KERNELDIR=/lib/modules/${kernelver}/build" +POST_BUILD="dkms-postbuild.sh" +MAKE="make -C driver/ KERNELDIR=/lib/modules/$kernelver/build" CLEAN="make -C driver/ clean" BUILT_MODULE_NAME=pciDriver BUILT_MODULE_LOCATION=driver/ diff --git a/pcitool.spec.in b/pcitool.spec.in index 07773da..136d47c 100644 --- a/pcitool.spec.in +++ b/pcitool.spec.in @@ -35,6 +35,7 @@ operation. %package -n libpcilib${PCILIB_ABI_VERSION} Summary: User-space PCI library Group: Development/Libraries +Provides: pcilib = %{version} Requires: pcilib-python >= %{version} Requires: pcilib-dkms >= %{version} @@ -58,6 +59,7 @@ API exposes 4 API layers. Summary: Development files for pcilib Group: Development/Libraries Requires: libpcilib${PCILIB_ABI_VERSION} = %{version} +Requires: uthash %description -n libpcilib-devel Development files for user-space PCI library @@ -138,6 +140,7 @@ mkdir -p $RPM_BUILD_ROOT/%{_includedir}/linux/ install -m 644 driver/ioctl.h $RPM_BUILD_ROOT/%{_includedir}/linux/pcidriver.h mkdir -p $RPM_BUILD_ROOT/usr/src/%{modname}-%{version}/pcilib/ install -m 644 misc/dkms.conf $RPM_BUILD_ROOT/%{_prefix}/src/%{modname}-%{version}/ +install -m 755 misc/dkms-postbuild.sh $RPM_BUILD_ROOT/%{_prefix}/src/%{modname}-%{version}/ install -m 644 pcilib/*.h $RPM_BUILD_ROOT/%{_prefix}/src/%{modname}-%{version}/pcilib/ cp -r driver $RPM_BUILD_ROOT/usr/src/%{modname}-%{version}/ @@ -231,7 +234,7 @@ exit 0 %if %{defined suse_version} /var/adm/fillup-templates/sysconfig.* %else -%{_sysconfdir}/sysconfig/* +%config %{_sysconfdir}/sysconfig/* %endif %{_unitdir}/* %{_datadir}/pcilib${PCILIB_ABI_VERSION}/pyserver diff --git a/pcitool/buildinfo.c b/pcitool/buildinfo.c index 2206c62..7160a3d 100644 --- a/pcitool/buildinfo.c +++ b/pcitool/buildinfo.c @@ -5,7 +5,7 @@ void BuildInfo() { printf("\n"); #ifdef PCILIB_RELEASE - printf("Release: %s (revision: %s built on %s in %s)\n", PCILIB_RELEASE, PCILIB_REVISION, PCILIB_BUILD_DATE, PCILIB_BUILD_DIR); + printf("Release: %s (r%s packaged on %s in %s)\n", PCILIB_RELEASE, PCILIB_REVISION, PCILIB_BUILD_DATE, PCILIB_BUILD_DIR); #else /* PCILIB_RELEASE */ printf("Revision: %s built on %s in %s\n", PCILIB_REVISION, PCILIB_BUILD_DATE, PCILIB_BUILD_DIR); #endif /* PCILIB_RELEASE */ |