[Lsb-messages] /var/www/bzr/lsb/devel/misc-test r2327: make archk/dynchk conditional; turn off dynchk for now

Mats Wichmann mats at linuxfoundation.org
Mon Nov 5 16:21:54 UTC 2012


------------------------------------------------------------
revno: 2327
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: misc-test
timestamp: Mon 2012-11-05 09:21:54 -0700
message:
  make archk/dynchk conditional; turn off dynchk for now
modified:
  makefile
  package/Makefile
  package/lsb-check.spec.sed
-------------- next part --------------
=== modified file 'makefile'
--- a/makefile	2012-10-17 14:05:57 +0000
+++ b/makefile	2012-11-05 16:21:54 +0000
@@ -5,8 +5,8 @@
 export LIB64=$(shell case `uname -m` in (ppc64|s390x|x86_64) echo 64 ;; esac)
 export LIBDIR=/lib$(LIB64)
 
-SUBDIRS=tetj fhschk elfchk rpmchk appchk libchk cmdchk pkgchk archk dynchk
-RELEASEDIRS=libchk appchk cmdchk pkgchk dynchk
+SUBDIRS=tetj fhschk elfchk rpmchk appchk libchk cmdchk pkgchk #archk dynchk
+RELEASEDIRS=libchk appchk cmdchk pkgchk #archk dynchk
 
 all:
 	for d in $(SUBDIRS);do (cd $$d && $(MAKE) all LSBVERSION=$$LSBVERSION);done

=== modified file 'package/Makefile'
--- a/package/Makefile	2012-11-03 18:29:12 +0000
+++ b/package/Makefile	2012-11-05 16:21:54 +0000
@@ -3,7 +3,11 @@
 # LSB package makefiles is partly bogus here - it works for the
 # tarball/srpm, and is used for build directory name, but does not
 # name packages
-# Also, for simplicity, the dpkg building, which we never use, is dropped
+# For simplicity, the dpkg building, which we never use, is dropped,
+# the target is now met by converting with alien
+# NOTE: to enable new packages, add/uncomment below rpm_package,
+# deb_package, list_uploadable and clean targets
+
 PACKAGE=lsb-check
 BZR_MODULE=misc-test
 
@@ -20,7 +24,7 @@
 
 # We define this here instead of directly in the spec file as
 # we need to be able to work out what the produced rpm files will be called
-RPM_PACKAGE_RELEASE=7
+RPM_PACKAGE_RELEASE=8
 
 # Derive date string for daily snapshots
 ISO_DATE:=$(shell date +"%Y%m%d")
@@ -137,7 +141,8 @@
 	@cp $(RPM_BINARY_DIR)/$(RPM_BINARY_APP) .
 	@cp $(RPM_BINARY_DIR)/$(RPM_BINARY_CMD) .
 	@cp $(RPM_BINARY_DIR)/$(RPM_BINARY_PKG) .
-	@cp $(RPM_BINARY_DIR)/$(RPM_BINARY_DYN) .
+	#@cp $(RPM_BINARY_DIR)/$(RPM_BINARY_AR) .
+	#@cp $(RPM_BINARY_DIR)/$(RPM_BINARY_DYN) .
 	@cp $(RPM_SRPM_DIR)/$(RPM_SOURCE_NAME) .
 	@rm -rf $(RPM_TMP_BUILD_DIR)
 
@@ -147,11 +152,12 @@
 	@fakeroot alien -dck $(RPM_BINARY_APP)
 	@fakeroot alien -dck $(RPM_BINARY_CMD)
 	@fakeroot alien -dck $(RPM_BINARY_PKG)
-	@fakeroot alien -dck $(RPM_BINARY_DYN)
+	#@fakeroot alien -dck $(RPM_BINARY_AR)
+	#@fakeroot alien -dck $(RPM_BINARY_DYN)
 
 # List files that should be uploaded to ftp server for snapshots
 list_uploadable:
-	@echo $(RPM_BINARY_LIB) $(RPM_BINARY_APP) $(RPM_BINARY_CMD) $(RPM_BINARY_PKG) $(RPM_BINARY_DYN)
+	@echo $(RPM_BINARY_LIB) $(RPM_BINARY_APP) $(RPM_BINARY_CMD) $(RPM_BINARY_PKG) #$(RPM_BINARY_AR) $(RPM_BINARY_DYN)
 ifdef LIST_SOURCE_FILES
 	@echo $(RPM_SOURCE_NAME) $(TARBALL) 
 endif
@@ -168,8 +174,9 @@
 	rm -f $(FULL_PACKAGE_NAME_LIB).rpm
 	rm -f $(FULL_PACKAGE_NAME_APP).rpm
 	rm -f $(FULL_PACKAGE_NAME_CMD).rpm
+	#rm -f $(FULL_PACKAGE_NAME_AR).rpm
+	#rm -f $(FULL_PACKAGE_NAME_DYN).rpm
 	rm -f $(FULL_PACKAGE_NAME_PKG).rpm
-	rm -f $(FULL_PACKAGE_NAME_DYN).rpm
 
 distclean: clean
 

=== modified file 'package/lsb-check.spec.sed'
--- a/package/lsb-check.spec.sed	2012-10-16 15:38:47 +0000
+++ b/package/lsb-check.spec.sed	2012-11-05 16:21:54 +0000
@@ -8,6 +8,10 @@
 %define xlib lib
 %endif
 
+# conditional parts
+# uncomment %description, %package, %files to turn on lsb-dynchk
+# and/or lsb-archk. Also see notes at %build and %install
+
 Name: lsb-check
 Summary: LSB Checkers
 Group: Development/Tools
@@ -84,32 +88,52 @@
 
 #%description -n lsb-archk
 #lsbarchk is a development tool used to check a static archive for
-#suitability for use in an LSB-compliant application. Use of non-LSB
+#suitability to use in an LSB-compliant application. Use of non-LSB
 #interfaces is flagged; the tool can be told about additional libraries
 #which are to be linked as part of the final link-edit.
 
-%package -n lsb-dynchk
-AutoReqProv: no
-Summary: LSB Dynamic Application Checking tool
-Group: Development/Tools
+#%package -n lsb-dynchk
+#AutoReqProv: no
+#Summary: LSB Dynamic Application Checking tool
+#Group: Development/Tools
 
-%description -n lsb-dynchk
-lsbdynchk is an application checker, one part of a series of checks
-that a application is LSB compliant. It is used during execution of the
-application to test the parameters that are passed to LSB interfaces.
+#%description -n lsb-dynchk
+#lsbdynchk is a run-time application checker. It is part of a series of
+#checks that an application conforms to LSB requirements.  It is used
+#during execution of the application to test the parameters that are
+#passed to LSB interfaces, which cannot be tested statically. Since only
+#actual executed code paths are tested, and this is hard to force,
+#it is not a formally required compliance check.
 
 
 %prep
 %setup -q
 
 %build
-# for 4.1, remove LSB_MODULES=Multimedia
-LSBCC_BESTEFFORT=1 CC=/opt/lsb/bin/lsbcc CXX=/opt/lsb/bin/lsbc++ make LSBVERSION=${RPM_PACKAGE_VERSION} LSBLIBCHK_VERSION=${RPM_PACKAGE_VERSION}-${RPM_PACKAGE_RELEASE} LSBAPPCHK_VERSION=${RPM_PACKAGE_VERSION}-${RPM_PACKAGE_RELEASE} LSBARCHK_VERSION=${RPM_PACKAGE_VERSION}-${RPM_PACKAGE_RELEASE} LSBCMDCHK_VERSION=${RPM_PACKAGE_VERSION}-${RPM_PACKAGE_RELEASE} LSBPKGCHK_VERSION=${RPM_PACKAGE_VERSION}-${RPM_PACKAGE_RELEASE} LSBDYNCHK_VERSION=${RPM_PACKAGE_VERSION}-${RPM_PACKAGE_RELEASE} all test
+# For building:
+# pieces to build controlled by SUBDIRS in top-level makefile
+# add LSB_MODULES declarations to enable optional modules
+# per-checker version strings are passed here also
+LSBCC_BESTEFFORT=1 CC=/opt/lsb/bin/lsbcc CXX=/opt/lsb/bin/lsbc++ \
+make \
+LSBVERSION=${RPM_PACKAGE_VERSION} \
+LSBLIBCHK_VERSION=${RPM_PACKAGE_VERSION}-${RPM_PACKAGE_RELEASE} \
+LSBAPPCHK_VERSION=${RPM_PACKAGE_VERSION}-${RPM_PACKAGE_RELEASE} \
+LSBARCHK_VERSION=${RPM_PACKAGE_VERSION}-${RPM_PACKAGE_RELEASE} \
+LSBCMDCHK_VERSION=${RPM_PACKAGE_VERSION}-${RPM_PACKAGE_RELEASE} \
+LSBPKGCHK_VERSION=${RPM_PACKAGE_VERSION}-${RPM_PACKAGE_RELEASE} \
+LSBARCHK_VERSION=${RPM_PACKAGE_VERSION}-${RPM_PACKAGE_RELEASE}\
+LSBDYNCHK_VERSION=${RPM_PACKAGE_VERSION}-${RPM_PACKAGE_RELEASE} \
+all test
 
 %install
+# For installing:
+# pieces to install controlled by RELEASEDIRS in top-level makefile
+# also uncomment/add stanza below to copy extra files
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL_ROOT=/opt/lsb
 
+# copy per-subpackage files that are not done by make install
 # libchk
 mkdir -p $RPM_BUILD_ROOT/opt/lsb/doc/lsb-check-lib
 cp package/Licence $RPM_BUILD_ROOT/opt/lsb/doc/lsb-check-lib
@@ -136,9 +160,9 @@
 #cp package/README-archk $RPM_BUILD_ROOT/opt/lsb/doc/lsb-check-ar/README
 
 # dynchk
-mkdir -p $RPM_BUILD_ROOT/opt/lsb/doc/lsb-check-dyn
-cp package/Licence $RPM_BUILD_ROOT/opt/lsb/doc/lsb-check-dyn
-cp package/README-dynchk $RPM_BUILD_ROOT/opt/lsb/doc/lsb-check-dyn/README
+#mkdir -p $RPM_BUILD_ROOT/opt/lsb/doc/lsb-check-dyn
+#cp package/Licence $RPM_BUILD_ROOT/opt/lsb/doc/lsb-check-dyn
+#cp package/README-dynchk $RPM_BUILD_ROOT/opt/lsb/doc/lsb-check-dyn/README
 
 %files -n lsb-libchk
 %defattr(-,root,root)
@@ -182,21 +206,22 @@
 #/opt/lsb/doc/lsb-check-ar/README
 #/opt/lsb/man/man1/lsbarchk.1
 
-# this rule is outdated, we don't do this; but it's not run anyway, so...
-%files -n lsb-dynchk
-%defattr(-,root,root)
-/opt/lsb/bin/lsbdynchk
-/opt/lsb/%xlib/liblsbdynchk.so.1
-%dir /opt/lsb/doc/lsb-check-dyn
-/opt/lsb/doc/lsb-check-dyn/Licence 
-/opt/lsb/doc/lsb-check-dyn/README
-/opt/lsb/man/man1/lsbdynchk.1
+#%files -n lsb-dynchk
+#%defattr(-,root,root)
+#/opt/lsb/bin/lsbdynchk
+#/opt/lsb/%xlib/liblsbdynchk.so.1
+#%dir /opt/lsb/doc/lsb-check-dyn
+#/opt/lsb/doc/lsb-check-dyn/Licence 
+#/opt/lsb/doc/lsb-check-dyn/README
+#/opt/lsb/man/man1/lsbdynchk.1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
-* Tue Sep 25 2011 Mats Wichmann <mats at linuxfoundation.org>
+* Mon Nov  5 2012 Mats Wichmann <mats at linuxfoundation.org>
+- more fiddling; comment "optional" pieces so it's clearer how to enable
+* Tue Sep 25 2012 Mats Wichmann <mats at linuxfoundation.org>
 - fiddled more with build - dynchk enabled
 * Fri Apr 01 2011 Mats Wichmann <mats at linuxfoundation.org>
 - seems to work now; set version to highest of the pkgs +1 so 4.1.2



More information about the lsb-messages mailing list