diff options
| author | biao716.wang <biao716.wang@samsung.com> | 2019-09-03 13:31:53 +0800 |
|---|---|---|
| committer | biao716.wang <biao716.wang@samsung.com> | 2019-09-03 13:34:26 +0800 |
| commit | 0fcf6f330bcc7b9a2bf89126053d9b91c8f2b153 (patch) | |
| tree | 22a5811dfe04de69b2539998a5f0e16b8f069cd2 | |
| parent | c13186c9c817d86d7daa7914bca01784b496877c (diff) | |
| parent | 4b3bedfc42bc2f9a310a437f81917877aa280d9d (diff) | |
| download | build-submit/trunk/20191101.102136.tar.gz build-submit/trunk/20191101.102136.tar.bz2 build-submit/trunk/20191101.102136.zip | |
Upgrade version to 0.25.9submit/trunk/20200219.120523submit/trunk/20200115.110101submit/trunk/20200114.110000submit/trunk/20200114.100000submit/trunk/20200110.111659submit/trunk/20200109.154402submit/trunk/20200109.151502submit/trunk/20200109.124502submit/trunk/20200109.112402submit/trunk/20200109.105802submit/trunk/20200108.172702submit/trunk/20200105.091815submit/trunk/20200104.134833submit/trunk/20200104.111033submit/trunk/20191101.102136submit/trunk/20191030.112603submit/trunk/20191017.233826submit/trunk/20191017.111201submit/trunk/20190927.010356accepted/tizen/devbase/tools/20200219.094525accepted/tizen/devbase/tools/20200115.231426accepted/tizen/devbase/tools/20200114.115759accepted/tizen/devbase/tools/20200114.020254accepted/tizen/devbase/tools/20200110.011840accepted/tizen/devbase/tools/20200109.052743accepted/tizen/devbase/tools/20200106.014258accepted/tizen/devbase/tools/20200104.060207release-20190904
merge devel to master
Change-Id: I38f2b309ece22640a55e582381327911b13c541a
Signed-off-by: biao716.wang <biao716.wang@samsung.com>
| -rw-r--r-- | Build.pm | 8 | ||||
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | packaging/build.changes | 6 | ||||
| -rw-r--r-- | packaging/build.spec | 6 |
4 files changed, 21 insertions, 6 deletions
@@ -346,10 +346,10 @@ sub read_config { } else { push @{$config->{'constraint'}}, $l; } - } elsif ($l0 eq 'rpmbuildstage:') { # use the rpmbuild --stage option - $config->{'rpmbuildstage'} = $l[0]; - } elsif ($l0 eq 'rpmbuildstage:') { # use the rpmbuild --stage option - $config->{'rpmbuildstage'} = $l[0]; + } elsif ($l0 eq 'rpmbuildstage:') { # use the rpmbuild --stage option + $config->{'rpmbuildstage'} = $l[0]; + } elsif ($l0 eq 'copylinkedpackages:') { # to enable the RPM compariton tool for prerelease projects + # Since it is not used in build package, do nothing. } elsif ($l0 eq 'singleexport:') { $config->{'singleexport'} = $l[0]; # avoid to export multiple package container in maintenance_release projects } elsif ($l0 !~ /^[#%]/) { diff --git a/debian/changelog b/debian/changelog index 0d04215..eb2df1b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +build (20160629-tizen20190830) unstable; urgency=high + + * update tizen version to tizen20190830 + * Support control.tar.xz format packages + + -- Wang Biao <biao716.wang@samsung.com> Fri, 30 Aug 2019 09:30:00 +0800 + build (20160629-tizen20181031) unstable; urgency=high * update tizen version to tizen20181031 diff --git a/packaging/build.changes b/packaging/build.changes index fb5f4e6..e6f7f5a 100644 --- a/packaging/build.changes +++ b/packaging/build.changes @@ -1,4 +1,10 @@ -------------------------------------------------------------------- +Fri Aug 30 09:30:00 CST 2019 - biao716.wang@samsung.com + +- Update tizen version to tizen20190830 +- Support control.tar.xz format packages + +-------------------------------------------------------------------- Thu Oct 31 09:30:00 CST 2018 - jingui.ren@samsung.com - Update tizen version to tizen20181031 diff --git a/packaging/build.spec b/packaging/build.spec index 761f2f5..9cb2cc0 100644 --- a/packaging/build.spec +++ b/packaging/build.spec @@ -71,7 +71,7 @@ Requires: build-mkbaselibs %if 0%{?suse_version} > 1120 || 0%{?mdkversion} Recommends: build-mkdrpms %endif -Provides: tizen-build = 20181031 +Provides: tizen-build = 20190830 %description This package provides a script for building RPMs for SUSE Linux in a chroot environment. @@ -115,7 +115,7 @@ Group: Development/Tools/Building Requires: build BuildRequires: gcc BuildRequires: glibc-devel -Provides: tizen-build-initvm-%{initvm_arch} = 20181031 +Provides: tizen-build-initvm-%{initvm_arch} = 20190830 Obsoletes: build-initvm %if 0%{?suse_version} BuildRequires: glibc-devel-static @@ -193,6 +193,8 @@ test -e default.conf /usr/lib/build/initvm.* %changelog +* Fri Aug 30 2019 biao716.wangn@samsung.com +- update tizen version to tizen20190830 * Wed Oct 31 2018 jingui.ren@samsung.com - update tizen version to tizen20181031 * Thu Sep 27 2018 jingui.ren@samsung.com |