[Lsb-messages] /var/www/bzr/lsb/devel/build_env r2098: build lsbdev-runner in build_env packages (bug 3739)

Mats Wichmann mats at linuxfoundation.org
Sat Mar 16 21:25:26 UTC 2013


------------------------------------------------------------
revno: 2098
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: build_env
timestamp: Sat 2013-03-16 15:25:26 -0600
message:
  build lsbdev-runner in build_env packages (bug 3739)
added:
  package/README-lsbrun
modified:
  Makefile
  lsbdev-runner/Makefile
  package/Makefile
  package/lsb-build.spec.sed
-------------- next part --------------
=== modified file 'Makefile'
--- a/Makefile	2010-03-04 20:19:15 +0000
+++ b/Makefile	2013-03-16 21:25:26 +0000
@@ -1,4 +1,4 @@
-SUBDIRS=headers stub_libs lsbdev-cc
+SUBDIRS=headers stub_libs lsbdev-cc lsbdev-runner
 SUBDIRS_NOSTUB=headers lsbdev-cc
 
 export BINDIR=/bin

=== modified file 'lsbdev-runner/Makefile'
--- a/lsbdev-runner/Makefile	2012-06-16 17:35:17 +0000
+++ b/lsbdev-runner/Makefile	2013-03-16 21:25:26 +0000
@@ -1,13 +1,24 @@
 CFLAGS = -g -Wall
 LDFLAGS = -static
 
+all: lsbrun
+
 lsbrun: lsbrun.o
 
+install: lsbrun
+	install -d $(DESTDIR)/$(INSTALL_ROOT)/$(BINDIR)
+	install lsbrun $(DESTDIR)/$(INSTALL_ROOT)/$(BINDIR)/lsbrun
+
+# dummies
+install-core install-desktop: install
+
 clean:
 	rm -f lsbrun.o lsbrun
 
-install: lsbrun
-	install -d $(INSTALL_ROOT)/$(BINDIR)
-	install lsbrun $(INSTALL_ROOT)/$(BINDIR)/lsbrun
+distclean:
+
+test:
+
+check: test
 
 .PHONY: install clean

=== modified file 'package/Makefile'
--- a/package/Makefile	2013-03-11 21:23:29 +0000
+++ b/package/Makefile	2013-03-16 21:25:26 +0000
@@ -42,11 +42,11 @@
 # Should have leading "."
 # a big number (80-99) is leading up to the next minor spec
 # build_env is version-independent so can wait till late to bump this
-SUB_VERSION=.31
+SUB_VERSION=.32
 
 # 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=8
+RPM_PACKAGE_RELEASE=1
 
 # Initialize LIB64 to proper value for 64-bit architectures
 export LIB64:=$(shell case `uname -m` in (ppc64 | s390x | x86_64) echo 64 ;; esac)
@@ -64,12 +64,14 @@
 FULL_PACKAGE_NAME_CC=$(PACKAGE)-cc-$(LSBVERSION)$(SUB_VERSION)*
 FULL_PACKAGE_NAME_BASE=$(PACKAGE)-base-$(LSBVERSION)$(SUB_VERSION)*
 FULL_PACKAGE_NAME_DESKTOP=$(PACKAGE)-desktop-$(LSBVERSION)$(SUB_VERSION)*
+FULL_PACKAGE_NAME_LSBRUN=lsbdev-runner-$(LSBVERSION)$(SUB_VERSION)*
 
 TARBALL=$(FULL_PACKAGE_NAME).tar.gz
 
 RPM_BINARY_CC=$(FULL_PACKAGE_CC)-$(RPM_PACKAGE_RELEASE).$(RPM_BUILD_ARCH).rpm
 RPM_BINARY_BASE=$(FULL_PACKAGE_BASE)-$(RPM_PACKAGE_RELEASE).$(RPM_BUILD_ARCH).rpm
 RPM_BINARY_DESKTOP=$(FULL_PACKAGE_DESKTOP)-$(RPM_PACKAGE_RELEASE).$(RPM_BUILD_ARCH).rpm
+RPM_BINARY_LSBRUN=$(FULL_PACKAGE_LSBRUN)-$(RPM_PACKAGE_RELEASE).$(RPM_BUILD_ARCH).rpm
 RPM_SOURCE_NAME=$(FULL_PACKAGE_NAME)-$(RPM_PACKAGE_RELEASE).src.rpm
 
 # Get value of RPM_PACKAGE_VERSION from LSBVERSION.
@@ -157,6 +159,7 @@
 	@cp $(RPM_BINARY_DIR)/$(RPM_BINARY_CC) .
 	@cp $(RPM_BINARY_DIR)/$(RPM_BINARY_BASE) .
 	@cp $(RPM_BINARY_DIR)/$(RPM_BINARY_DESKTOP) .
+	@cp $(RPM_BINARY_DIR)/$(RPM_BINARY_LSBRUN) .
 	@cp $(RPM_SRPM_DIR)/$(RPM_SOURCE_NAME) .
 	@rm -rf $(RPM_TMP_BUILD_DIR)
 
@@ -188,6 +191,7 @@
 	rm -f $(FULL_PACKAGE_NAME_CC).rpm
 	rm -f $(FULL_PACKAGE_NAME_BASE).rpm
 	rm -f $(FULL_PACKAGE_NAME_DESKTOP).rpm
+	rm -f $(FULL_PACKAGE_NAME_LSBRUN).rpm
 	rm -rf $(FULL_PACKAGE_NAME_CLEAN)
 	rm -f core_pkglist_pruned desktop_pkglist_pruned
 

=== added file 'package/README-lsbrun'
--- a/package/README-lsbrun	1970-01-01 00:00:00 +0000
+++ b/package/README-lsbrun	2013-03-16 21:25:26 +0000
@@ -0,0 +1,37 @@
+LSB Application Runner
+======================
+
+This package contains lsbrun, a simple utility which can mimic an LSB
+environment for LSB-compliant applications on systems which do not
+provide an LSB runtime environment.
+
+Please note that lsbrun is not a miracle worker.  It can only allow an
+application to run if the system is mostly LSB-compliant, and is only
+missing the LSB dynamic linker.  It cannot emulate missing libraries
+or API calls, or correct incorrect behavior.
+
+License
+-------
+
+lsbrun is Copyright 2007 The Linux Foundation, and distributed under
+the terms of the BSD license.  See the Licence file for details.
+
+Usage
+-----
+
+The lsbrun utility acts as a helper for LSB-compliant apps, setting up
+the environment to compensate for a missing LSB dynamic linker.  You
+can run it in this way by just running "lsbrun <app>".
+
+It can also install itself as a transparent shim around an LSB app.
+Run it as "lsbrun --check <app>", and it will check for an LSB
+environment.  If it finds one, lsbrun will simply exit.  If not, it
+will move the original app binary and copy itself in its place.  From
+then on, running the original binary's path will invoke lsbrun
+transparently.
+
+Feedback
+--------
+
+Please send any comments you may have to
+lsb-discuss at lists.linux-foundation.org.

=== modified file 'package/lsb-build.spec.sed'
--- a/package/lsb-build.spec.sed	2013-02-11 20:21:10 +0000
+++ b/package/lsb-build.spec.sed	2013-03-16 21:25:26 +0000
@@ -59,6 +59,20 @@
 The LSB Build Environment cc package provides lsbcc, which can be used
 to help build LSB conforming applications.
 
+%package -n lsbdev-runner
+Summary: LSB application runner for non-LSB systems
+
+%description -n lsbdev-runner
+This package provides lsbrun, a utility for running LSB-compliant
+applications on Linux systems that do not provide a LSB runtime
+(at least as well as such applications can run).
+Group: Development/Tools
+AutoReqProv: no
+%description -n lsbdev-runner
+This package provides lsbrun, a utility for running LSB-compliant
+applications on Linux systems that do not provide a LSB runtime
+(at least as well as such applications can run).
+
 %prep
 %setup -q
 
@@ -103,6 +117,11 @@
   gzip -9 $RPM_BUILD_ROOT/opt/lsb/man/man1/$manpage
 done
 
+# specifics for lsbdev-runner:
+mkdir -p $RPM_BUILD_ROOT/opt/lsb/doc/lsbrun
+cp package/Licence $RPM_BUILD_ROOT/opt/lsb/doc/lsbrun
+cp package/README-lsbrun $RPM_BUILD_ROOT/opt/lsb/doc/lsbrun/README
+
 # before leaving, we have to fix up the file lists:
 (cd package && make core_pkglist_pruned && make desktop_pkglist_pruned)
 sed -e 's,BASE,/opt/lsb,' -e 's,LIB,%xlib,' package/core_pkglist_pruned > core_pkglist_final
@@ -452,11 +471,21 @@
 /opt/lsb/man/man1/lsbc++.1.gz
 /opt/lsb/man/man1/lsbcc.1.gz
 /opt/lsb/man/man1/lsbcpp.1.gz
+
+%files -n lsbdev-runner
+%defattr(-,root,root)
+/opt/lsb/bin/lsbrun
+%dir /opt/lsb/doc/lsbrun
+/opt/lsb/doc/lsbrun/Licence
+/opt/lsb/doc/lsbrun/README
   
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Sat Mar 16 2013 Mats Wichmann <mats at linuxfounation.org
+- import the build of lsbdev-runner here from old packaging dir
+
 * Thu Feb 24 2011 Stew Benedict <stewb at linux-foundation.org>
 -  own the directories we populate (bug 3195)
 



More information about the lsb-messages mailing list