diff options
| -rw-r--r-- | debian/.git-dpm | 8 | ||||
| -rw-r--r-- | debian/changelog | 11 | ||||
| -rw-r--r-- | debian/compat | 1 | ||||
| -rw-r--r-- | debian/control | 16 | ||||
| -rw-r--r-- | debian/copyright | 33 | ||||
| -rw-r--r-- | debian/docs | 1 | ||||
| -rw-r--r-- | debian/links | 1 | ||||
| -rw-r--r-- | debian/patches/0001-Use-obs-build-in-locations-and-executable-names-inst.patch | 67 | ||||
| -rw-r--r-- | debian/patches/0002-Fix-Build-Zypp-parsecfg-expected-full-config-file-na.patch | 25 | ||||
| -rw-r--r-- | debian/patches/series | 2 | ||||
| -rwxr-xr-x | debian/rules | 3 | ||||
| -rw-r--r-- | debian/source/format | 1 | ||||
| -rw-r--r-- | debian/source/options | 2 | ||||
| -rw-r--r-- | debian/watch | 2 |
14 files changed, 173 insertions, 0 deletions
diff --git a/debian/.git-dpm b/debian/.git-dpm new file mode 100644 index 0000000..f1431c4 --- /dev/null +++ b/debian/.git-dpm @@ -0,0 +1,8 @@ +# see git-dpm(1) from git-dpm package +23590deedb2bf7d7482e1ec49eb735c64dce9883 +23590deedb2bf7d7482e1ec49eb735c64dce9883 +31ec7f8a73cc77d937267b9ae440bed5485fea1e +31ec7f8a73cc77d937267b9ae440bed5485fea1e +obs-build_20141024.orig.tar.gz +46752764ecae152927bfbefcf3c80c9fb3e609e0 +204905 diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..a4af05b --- /dev/null +++ b/debian/changelog @@ -0,0 +1,11 @@ +obs-build (20140918-1ubuntu1) UNRELEASED; urgency=medium + + * New upstream snapshot. + + -- Dimitri John Ledkov <dimitri.j.ledkov@intel.com> Sat, 25 Oct 2014 02:30:05 +0100 + +obs-build (20140918-1) unstable; urgency=medium + + * Initial release. (Closes: #762949) + + -- Dimitri John Ledkov <dimitri.j.ledkov@linux.intel.com> Wed, 01 Oct 2014 11:46:00 +0100 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..2394373 --- /dev/null +++ b/debian/control @@ -0,0 +1,16 @@ +Source: obs-build +Section: devel +Priority: extra +Maintainer: Dimitri John Ledkov <dimitri.j.ledkov@linux.intel.com> +Build-Depends: debhelper (>= 9) +Standards-Version: 3.9.6.0 + +Package: obs-build +Architecture: all +Depends: ${perl:Depends}, rpm +Recommends: rpm2cpio, osc, libcrypt-ssleay-perl +Description: scripts for building RPM/debian packages for multiple distributions + This package provides scripts for building RPM and debian packages in + contained environments for various build distributions. These tools + are use by Open Build Service workers and openSUSE distribution by + default.
\ No newline at end of file diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..fb55af5 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,33 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: obs-build +Upstream-Contact: Adrian Schröter <adrian@suse.de> +Source: https://github.com/openSUSE/obs-build + + +Files: * +Copyright: 1997-2014 SuSE GmbH Nuernberg, Germany +License: GPL-2+ + +Files: debian/* +Copyright: 2014 Intel Corporation +License: GPL-2+ + This program is free software; you can redistribute it + and/or modify it under the terms of the GNU General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later + version. + . + This program is distributed in the hope that it will be + useful, but WITHOUT ANY WARRANTY; without even the implied + warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the GNU General Public License for more + details. + . + You should have received a copy of the GNU General Public + License along with this package; if not, write to the Free + Software Foundation, Inc., 51 Franklin St, Fifth Floor, + Boston, MA 02110-1301 USA + . + On Debian systems, the full text of the GNU General Public + License version 2 can be found in the file + `/usr/share/common-licenses/GPL-2'. diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000..e845566 --- /dev/null +++ b/debian/docs @@ -0,0 +1 @@ +README diff --git a/debian/links b/debian/links new file mode 100644 index 0000000..a6a9c11 --- /dev/null +++ b/debian/links @@ -0,0 +1 @@ +usr/lib/obs-build/configs/sl11.1.conf usr/lib/obs-build/configs/sles11.conf diff --git a/debian/patches/0001-Use-obs-build-in-locations-and-executable-names-inst.patch b/debian/patches/0001-Use-obs-build-in-locations-and-executable-names-inst.patch new file mode 100644 index 0000000..5bcf9b6 --- /dev/null +++ b/debian/patches/0001-Use-obs-build-in-locations-and-executable-names-inst.patch @@ -0,0 +1,67 @@ +From e9487df6bd6aafdc75cdb92b388d6ab49cca7a95 Mon Sep 17 00:00:00 2001 +From: Dimitri John Ledkov <dimitri.j.ledkov@intel.com> +Date: Wed, 1 Oct 2014 10:44:55 +0100 +Subject: Use obs-build in locations and executable names, instead of just + build. + +Signed-off-by: Dimitri John Ledkov <dimitri.j.ledkov@intel.com> +--- + Makefile | 13 +++++++------ + build | 6 +++--- + 2 files changed, 10 insertions(+), 9 deletions(-) + +diff --git a/Makefile b/Makefile +index 8c84ced..94e4abb 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,7 +1,7 @@ + VERSION=0.1 + SCM=$(shell if test -d .svn; then echo svn; elif test -d .git; then echo git; fi) + DATE=$(shell date +%Y%m%d%H%M) +-BUILD=build ++BUILD=obs-build + + INITVM_ARCH=$(shell bash -c '. common_functions ; build_host_arch; echo $$BUILD_INITVM_ARCH') + +@@ -68,11 +68,12 @@ install: + install -m644 build-pkg build-pkg-* $(DESTDIR)$(pkglibdir) + install -m644 *.pm baselibs_global*.conf lxc.conf $(DESTDIR)$(pkglibdir) + install -m644 configs/* $(DESTDIR)$(pkglibdir)/configs +- install -m644 build.1 $(DESTDIR)$(man1dir) +- install -m644 vc.1 $(DESTDIR)$(man1dir) +- install -m644 unrpm.1 $(DESTDIR)$(man1dir) +- ln -sf $(pkglibdir)/build $(DESTDIR)$(bindir)/build +- ln -sf $(pkglibdir)/vc $(DESTDIR)$(bindir)/buildvc ++ install -d $(DESTDIR)$(man1dir) ++ install -T -m644 build.1 $(DESTDIR)$(man1dir)/obs-build.1 ++ install -T -m644 vc.1 $(DESTDIR)$(man1dir)/obs-buildvc.1 ++ install -T -m644 unrpm.1 $(DESTDIR)$(man1dir)/unrpm.1 ++ ln -sf $(pkglibdir)/build $(DESTDIR)$(bindir)/obs-build ++ ln -sf $(pkglibdir)/vc $(DESTDIR)$(bindir)/obs-buildvc + ln -sf $(pkglibdir)/unrpm $(DESTDIR)$(bindir)/unrpm + + # Allow initvm to be packaged seperately from the rest of build. This +diff --git a/build b/build +index cdba8f8..3a5f696 100755 +--- a/build ++++ b/build +@@ -31,8 +31,8 @@ if test "$0" = /sbin/init ; then + fi + + test -z "$BUILD_DIR" -a -e /.build/build.data -a -z "$BUILD_IGNORE_2ND_STAGE" && BUILD_DIR=/.build +-test -z "$BUILD_DIR" && BUILD_DIR=/usr/lib/build +-test -z "$BUILD_ROOT" && BUILD_ROOT=/var/tmp/build-root ++test -z "$BUILD_DIR" && BUILD_DIR=/usr/lib/obs-build ++test -z "$BUILD_ROOT" && BUILD_ROOT=/var/tmp/obs-build-root + test -z "$CONFIG_DIR" && CONFIG_DIR="$BUILD_DIR/configs" + + export CHROOT="chroot $BUILD_ROOT" +@@ -94,7 +94,7 @@ DO_STATISTICS= + RUN_SHELL= + CCACHE= + DLNOSIGNATURE= +-CACHE_DIR=/var/cache/build ++CACHE_DIR=/var/cache/obs-build + + + # This is for insserv diff --git a/debian/patches/0002-Fix-Build-Zypp-parsecfg-expected-full-config-file-na.patch b/debian/patches/0002-Fix-Build-Zypp-parsecfg-expected-full-config-file-na.patch new file mode 100644 index 0000000..0cda1cc --- /dev/null +++ b/debian/patches/0002-Fix-Build-Zypp-parsecfg-expected-full-config-file-na.patch @@ -0,0 +1,25 @@ +From 23590deedb2bf7d7482e1ec49eb735c64dce9883 Mon Sep 17 00:00:00 2001 +From: Dimitri John Ledkov <dimitri.j.ledkov@intel.com> +Date: Fri, 3 Oct 2014 14:28:45 +0100 +Subject: Fix Build::Zypp:parsecfg expected full config file name. + +Fixes #135 + +Signed-off-by: Dimitri John Ledkov <dimitri.j.ledkov@intel.com> +--- + Build/Zypp.pm | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Build/Zypp.pm b/Build/Zypp.pm +index 20d020c..7518d17 100644 +--- a/Build/Zypp.pm ++++ b/Build/Zypp.pm +@@ -28,7 +28,7 @@ sub parsecfg { + my ($repocfg, $reponame) = @_; + + local *REPO; +- open(REPO, '<', "$root/etc/zypp/repos.d/$repocfg.repo") or return undef; ++ open(REPO, '<', "$root/etc/zypp/repos.d/$repocfg") or return undef; + my $name; + my $repo = {}; + while (<REPO>) { diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..24ce1f5 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +0001-Use-obs-build-in-locations-and-executable-names-inst.patch +0002-Fix-Build-Zypp-parsecfg-expected-full-config-file-na.patch diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..cbe925d --- /dev/null +++ b/debian/rules @@ -0,0 +1,3 @@ +#!/usr/bin/make -f +%: + dh $@ diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/source/options b/debian/source/options new file mode 100644 index 0000000..22e912a --- /dev/null +++ b/debian/source/options @@ -0,0 +1,2 @@ +no-preparation +extend-diff-ignore=configs/sles11.conf diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..65768a1 --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://download.opensuse.org/repositories/OBS:/Server:/Unstable/xUbuntu_12.04/build_(.*)\.orig\.tar\.gz |