I have made the following changes intended for : CE:MW:Shared / nemo-ssu-repos
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/8427 Thank You, Marko Saukko [This message was auto-generated] --- Request # 8427: Messages from BOSS: State: review at 2013-03-14T11:32:19 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:sage:branches:CE:MW:Shared / nemo-ssu-repos -> CE:MW:Shared / nemo-ssu-repos changes files: -------------- --- nemo-ssu-repos.changes +++ nemo-ssu-repos.changes @@ -1,4 +1,4 @@ -* Tue Nov 27 2012 Marko Saukko <[email protected]> - 0.1.1 -- Fix repository URL's and variables with the new repository structures. -- Renamed adaptation-extras to adaptation-common, dropped the empty - main package +* Thu Mar 14 2013 Marko Saukko <[email protected]> - 0.1.2 +- [boards] fix for new obs structure. +- [Packaging] Merge packaging to the git tree. +- [repos] take domain options in use. @@ -6,2 +5,0 @@ -* Mon Oct 22 2012 Bernd Wachter <[email protected]> - 0.1 -- Initial package with Nemo ssu configuration old: ---- nemo-ssu-repos-0.1.1.tar.gz new: ---- nemo-ssu-repos-0.1.2.tar.gz spec files: ----------- --- nemo-ssu-repos.spec +++ nemo-ssu-repos.spec @@ -1,5 +1,5 @@ Name: nemo-ssu-repos -Version: 0.1.1 +Version: 0.1.2 Release: 1 Summary: Nemo SSU repositories URL: https://github.com/nemomobile/nemo-ssu-repos other changes: -------------- ++++++ nemo-ssu-repos-0.1.1.tar.gz -> nemo-ssu-repos-0.1.2.tar.gz --- .gitignore +++ .gitignore (renamed to nemo-ssu-repos-0.1.2/.gitignore) --- nemo-ssu-repos-0.1.2/.gitignore +++ nemo-ssu-repos-0.1.2/.gitignore (renamed from .gitignore) --- nemo-ssu-repos-0.1.2/nemo-ssu-repos.pro +++ nemo-ssu-repos-0.1.2/nemo-ssu-repos.pro (renamed from nemo-ssu-repos.pro) --- nemo-ssu-repos-0.1.2/repos/adaptation-common-rnd.repo +++ nemo-ssu-repos-0.1.2/repos/adaptation-common-rnd.repo (renamed from repos/adaptation-common-rnd.repo) --- nemo-ssu-repos-0.1.2/repos/adaptation-rnd.repo +++ nemo-ssu-repos-0.1.2/repos/adaptation-rnd.repo (renamed from repos/adaptation-rnd.repo) --- nemo-ssu-repos-0.1.2/repos/mer-core-rnd.repo +++ nemo-ssu-repos-0.1.2/repos/mer-core-rnd.repo (renamed from repos/mer-core-rnd.repo) --- nemo-ssu-repos-0.1.2/repos/nemo-rnd.repo +++ nemo-ssu-repos-0.1.2/repos/nemo-rnd.repo (renamed from repos/nemo-rnd.repo) --- nemo-ssu-repos-0.1.2/repos/repos.pro +++ nemo-ssu-repos-0.1.2/repos/repos.pro (renamed from repos/repos.pro) --- nemo-ssu-repos-0.1.2/rpm/nemo-ssu-repos.spec +++ nemo-ssu-repos-0.1.2/rpm/nemo-ssu-repos.spec @@ -0,0 +1,139 @@ +Name: nemo-ssu-repos +Version: 0.1.1 +Release: 1 +Summary: Nemo SSU repositories +URL: https://github.com/nemomobile/nemo-ssu-repos +Group: System/Base +BuildArch: noarch +License: GPLv2 +Source0: %{name}-%{version}.tar.gz +BuildRequires: pkgconfig(QtCore) + +%description +%{summary}. + + +%package -n ssu-vendor-data-nemo +Summary: Sample vendor configuration data +Group: System/Base +Requires: ssu +Provides: ssu-vendor-data + +%description -n ssu-vendor-data-nemo +%{summary}. A vendor (including Nemo) is supposed to put those configuration on device. + +%files -n ssu-vendor-data-nemo +%defattr(-,root,root,-) +%attr(0664, root, ssu) %config(noreplace) %{_sysconfdir}/ssu/ssu.ini +%{_datadir}/ssu/*.ini + + +%package release +Summary: Release repositories +Group: System/Base +Requires: ssu + +%description release +%{summary}. + +%files release +%defattr(-,root,root,-) +%config %{_sysconfdir}/zypp/repos.d/mer-core-release.repo +%config %{_sysconfdir}/zypp/repos.d/nemo-release.repo + +%package adaptation-release +Summary: Adaptation repositories +Group: System/Base +Requires: ssu + +%description adaptation-release +This package provides device-specific adaptation for any +device where ssu can determine the correct device type, +as well as the main common adaptation repository. If your +device uses more than one common adaptation you will have +to install adaptation-extra-release, and enable the required +repositories. The repositories here are disabled per default. + +%files adaptation-release +%defattr(-,root,root,-) +%config %{_sysconfdir}/zypp/repos.d/adaptation-release.repo + + +%package adaptation-common-release +Summary: Common adaptation repositories +Group: System/Base +Requires: ssu + +%description adaptation-common-release +This package provides common adaptation repositories for +devices using common adaptation repo in addition to normal +adaptation repository. + +%files adaptation-common-release +%defattr(-,root,root,-) +%config %{_sysconfdir}/zypp/repos.d/adaptation-common-release.repo + + +%package rnd +Summary: RND repositories +Group: System/Base +Requires: ssu + +%description rnd +%{summary}. + +%files rnd +%defattr(-,root,root,-) +%config %{_sysconfdir}/zypp/repos.d/mer-core-rnd.repo +%config %{_sysconfdir}/zypp/repos.d/nemo-rnd.repo + + +%package adaptation-rnd +Summary: RND adaptation repositories, device specific +Group: System/Base +Requires: ssu + +%description adaptation-rnd +This package provides device-specific adaptation for any +any device where ssu can determine the correct device type, +as well as the main common adaptation repository. If your +device uses more than one common adaptation you will have +to install adaptation-extra-rnd, and enable the required +repositories. + +%files adaptation-rnd +%defattr(-,root,root,-) +%config %{_sysconfdir}/zypp/repos.d/adaptation-rnd.repo + + +%package adaptation-common-rnd +Summary: Common adaptation repositories +Group: System/Base +Requires: ssu + +%description adaptation-common-rnd +This package provides common adaptation repositories for +devices using common adaptation repo in addition to normal +adaptation repository. + +%files adaptation-common-rnd +%defattr(-,root,root,-) +%config %{_sysconfdir}/zypp/repos.d/adaptation-common-rnd.repo + + +%prep +%setup -q + + +%build +qmake DEFINES+='TARGET_ARCH=\\\"\"%{_target_cpu}\"\\\"' -recursive +make %{?_smp_mflags} + + +%install +make INSTALL_ROOT=%{buildroot} install +RND_REPOS="nemo mer-core adaptation adaptation-common"; \ +for REPO in $RND_REPOS; do + sed -r 's/-rnd/-release/;s/\?rnd&?/?/;s/\?$//' %{buildroot}/%{_sysconfdir}/zypp/repos.d/$REPO-rnd.repo \ + > %{buildroot}/%{_sysconfdir}/zypp/repos.d/$REPO-release.repo +done --- nemo-ssu-repos-0.1.2/ssu/board-mappings.ini +++ nemo-ssu-repos-0.1.2/ssu/board-mappings.ini @@ -0,0 +1,70 @@ +### Don't edit this file manually. Update it in git, if there's a good reason to do so ### +# +# This file is used by SSU to find out which device (or device variant) it's +# running on, and use this information to look for device family, and device +# specific adaptation(s). The last two values are used when resolving URLs, +# and therefore change depending on vendor setup. +# +# To avoid quoting in the search strings SSU will do each checks on the +# _value_, and return the key, if successful. The device model returned +# my either be the device model, or a variant. Before resolving the family +# and adaptations variants will be resolved through entries under the +# variants category. +# +# Valid categories for determining the model: +# - file.exists -- checks for existince of a file in the filesystem +# - systeminfo.equals -- compares the model returned by QSystemInfo +# with the value provided +# - cpuinfo.contains -- searches /proc/cpuinfo for a string +# - arch.equals -- compares with zyppers arch (like i586) +# +# Resolve order is: +# file.exists -> systeminfo.equals -> cpuinfo.contains -> arch.equals +# +# The found model (after resolving variants) will be used as category. The +# following keys are valid there: +# - family -- the device family, used for the family specific adaptation +# - adaptations -- list of additional adaptations, shared between families +# +# The value of adaptations gets converted into a QStringList, which uses +# commas as separator. If one of the adaptation names contains a comma it +# needs to be quoted: +# adaptation=foo +# adaptation="foo, bar", baz +# adaptation=foo, bar, baz +# +# The N9x mappings should be solved through sysinfo, but that's currently +# broken on Mer/Nemo + +[file.exists] +SDK=/mer-sdk-chroot + +[systeminfo.equals] + +[cpuinfo.contains] +N900=Nokia RX-51 board +N950=Nokia RM-680 board +N9=Nokia RM-696 board + +[arch.equals] +generic-x86=i586 + +[variants] +N950=N9 + +[N9] +family=ti:/omap3:/n950-n9 +adaptation=ti:/omap3:/n9xx + +[N900] +family=ti:/omap3:/n900 +adaptations=ti:/omap3:/n9xx + +[SDK] + +[generic-x86] +family=x86:/x86-common + +[UNKNOWN] +family=UNKNOWN + --- nemo-ssu-repos-0.1.2/ssu/repos.ini +++ nemo-ssu-repos-0.1.2/ssu/repos.ini @@ -0,0 +1,72 @@ +### Don't edit this file manually. Update it in git, if there's a good reason to do so ### +# +# If you need custom variables for URLs, add them to /etc/ssu/ssu.ini: +# ... +# [repository-url-variables] +# foo=bar +# ... +# +# If you need custom repository URLs, add them to /etc/ssu/ssu.ini: +# ... +# [repository-urls] +# custom=http://example.com/%(foo)/ +# ... +# +# Default variables are: +# +# Variables resolved during package build: +# %(arch) Package architecture, as in i586 or armv7hl +# +# Variables resolved by URL parameters in repository: +# %(deviceFamily) A device family in adaptation, like mrst or n9xx +# %(debugSplit) Set to debug if 'debug' parameter is present, to packages otherwise +# +# Variables resolved from configuration: +# %(release) A release, which will be replaced to 'next' or 'latest' for RnD, or a release number +# %(flavour) A flavour (RnD only), which will be replaced to one of 'devel', 'testing' or 'release' +# %(adaptation) The device specific adaptation, for example 'n900' or 'n950-n9' +# +# +# Repository lookup will happen based on the 'repo' parameter in repository +# URLs. For RnD repositories order will be <flavour> -> rnd -> all, for +# release repositories release -> all. +# +# Valid url specifications in repo files for RnD repositories include: +# +# baseurl=plugin:ssu?repo=non-oss&rnd +# baseurl=plugin:ssu?repo=mer-core&rnd&debug +# baseurl=plugin:ssu?repo=non-oss&rnd&deviceFamily=mrst +# +# Valid url specifications in repo files for release repositories include: +# +# baseurl=plugin:ssu?repo=non-oss +# baseurl=plugin:ssu?repo=non-oss&deviceFamily=mrst + + +[all] +credentials= +mer-core=%(releaseProtocol)://%(releaseDomainMer)%(release)/builds/%(arch)/%(debugSplit)/ +nemo-mw=%(releaseProtocol)://%(releaseDomainNemo)%(flavour):/mw/%(release)_%(arch)/ +nemo-apps=%(releaseProtocol)://%(releaseDomainNemo)%(flavour):/apps/%(release)_%(arch)/ +nemo-ux=%(releaseProtocol)://%(releaseDomainNemo)%(flavour):/ux/%(release)_%(arch)/ +adaptation-common=%(releaseProtocol)://%(releaseDomainNemo)%(flavour):/hw:/%(adaptation)-common/%(release)_%(arch)/ +adaptation=%(releaseProtocol)://%(releaseDomainNemo)%(flavour):/hw:/%(deviceFamily)/%(release)_%(arch)/ + +[release] + +[rnd] + +[release-flavour] +flavour-pattern=stable + +[testing-flavour] +flavour-pattern=testing + +[devel-flavour] +flavour-pattern=devel + +[default-domain] +releaseProtocol=http +releaseDomainMer=releases.merproject.org/releases/ +releaseDomainNemo=repo.merproject.org/obs/nemo:/ + --- nemo-ssu-repos-0.1.2/ssu/ssu-defaults.ini +++ nemo-ssu-repos-0.1.2/ssu/ssu-defaults.ini (renamed from ssu/ssu-defaults.ini) --- nemo-ssu-repos-0.1.2/ssu/ssu.ini +++ nemo-ssu-repos-0.1.2/ssu/ssu.ini (renamed from ssu/ssu.ini) --- nemo-ssu-repos-0.1.2/ssu/ssu.pro +++ nemo-ssu-repos-0.1.2/ssu/ssu.pro (renamed from ssu/ssu.pro) --- nemo-ssu-repos.pro +++ nemo-ssu-repos.pro (renamed to nemo-ssu-repos-0.1.2/nemo-ssu-repos.pro) --- repos +++ repos -(directory) --- repos/adaptation-common-rnd.repo +++ repos/adaptation-common-rnd.repo (renamed to nemo-ssu-repos-0.1.2/repos/adaptation-common-rnd.repo) --- repos/adaptation-rnd.repo +++ repos/adaptation-rnd.repo (renamed to nemo-ssu-repos-0.1.2/repos/adaptation-rnd.repo) --- repos/mer-core-rnd.repo +++ repos/mer-core-rnd.repo (renamed to nemo-ssu-repos-0.1.2/repos/mer-core-rnd.repo) --- repos/nemo-rnd.repo +++ repos/nemo-rnd.repo (renamed to nemo-ssu-repos-0.1.2/repos/nemo-rnd.repo) --- repos/repos.pro +++ repos/repos.pro (renamed to nemo-ssu-repos-0.1.2/repos/repos.pro) --- ssu +++ ssu -(directory) --- ssu/board-mappings.ini +++ ssu/board-mappings.ini @@ -1,68 +0,0 @@ -### Don't edit this file manually. Update it in git, if there's a good reason to do so ### -# -# This file is used by SSU to find out which device (or device variant) it's -# running on, and use this information to look for device family, and device -# specific adaptation(s). The last two values are used when resolving URLs, -# and therefore change depending on vendor setup. -# -# To avoid quoting in the search strings SSU will do each checks on the -# _value_, and return the key, if successful. The device model returned -# my either be the device model, or a variant. Before resolving the family -# and adaptations variants will be resolved through entries under the -# variants category. -# -# Valid categories for determining the model: -# - file.exists -- checks for existince of a file in the filesystem -# - systeminfo.equals -- compares the model returned by QSystemInfo -# with the value provided -# - cpuinfo.contains -- searches /proc/cpuinfo for a string -# - arch.equals -- compares with zyppers arch (like i586) -# -# Resolve order is: -# file.exists -> systeminfo.equals -> cpuinfo.contains -> arch.equals -# -# The found model (after resolving variants) will be used as category. The -# following keys are valid there: -# - family -- the device family, used for the family specific adaptation -# - adaptations -- list of additional adaptations, shared between families -# -# The value of adaptations gets converted into a QStringList, which uses -# commas as separator. If one of the adaptation names contains a comma it -# needs to be quoted: -# adaptation=foo -# adaptation="foo, bar", baz -# adaptation=foo, bar, baz -# -# The N9x mappings should be solved through sysinfo, but that's currently -# broken on Mer/Nemo - -[file.exists] -SDK=/mer-sdk-chroot - -[systeminfo.equals] - -[cpuinfo.contains] -N900=Nokia RX-51 board -N950=Nokia RM-680 board -N9=Nokia RM-696 board - -[arch.equals] -generic-x86=i586 - -[variants] -N950=N9 - -[N9] -family=n950-n9 - -[N900] -family=n900 - -[SDK] - -[generic-x86] -family=x86 - -[UNKNOWN] -family=UNKNOWN - --- ssu/repos.ini +++ ssu/repos.ini @@ -1,67 +0,0 @@ -### Don't edit this file manually. Update it in git, if there's a good reason to do so ### -# -# If you need custom variables for URLs, add them to /etc/ssu/ssu.ini: -# ... -# [repository-url-variables] -# foo=bar -# ... -# -# If you need custom repository URLs, add them to /etc/ssu/ssu.ini: -# ... -# [repository-urls] -# custom=http://example.com/%(foo)/ -# ... -# -# Default variables are: -# -# Variables resolved during package build: -# %(arch) Package architecture, as in i586 or armv7hl -# -# Variables resolved by URL parameters in repository: -# %(deviceFamily) A device family in adaptation, like mrst or n9xx -# %(debugSplit) Set to debug if 'debug' parameter is present, to packages otherwise -# -# Variables resolved from configuration: -# %(release) A release, which will be replaced to 'next' or 'latest' for RnD, or a release number -# %(flavour) A flavour (RnD only), which will be replaced to one of 'devel', 'testing' or 'release' -# %(adaptation) The device specific adaptation, for example 'n900' or 'n950-n9' -# -# -# Repository lookup will happen based on the 'repo' parameter in repository -# URLs. For RnD repositories order will be <flavour> -> rnd -> all, for -# release repositories release -> all. -# -# Valid url specifications in repo files for RnD repositories include: -# -# baseurl=plugin:ssu?repo=non-oss&rnd -# baseurl=plugin:ssu?repo=mer-core&rnd&debug -# baseurl=plugin:ssu?repo=non-oss&rnd&deviceFamily=mrst -# -# Valid url specifications in repo files for release repositories include: -# -# baseurl=plugin:ssu?repo=non-oss -# baseurl=plugin:ssu?repo=non-oss&deviceFamily=mrst - - -[all] -credentials= -mer-core=http://releases.merproject.org/releases/%(release)/builds/%(arch)/%(debugSplit)/ -nemo-mw=http://repo.merproject.org/nemo:/%(flavour):/mw/%(release)_%(arch)/ -nemo-apps=http://repo.merproject.org/nemo:/%(flavour):/apps/%(release)_%(arch)/ -nemo-ux=http://repo.merproject.org/nemo:/%(flavour):/ux/%(release)_%(arch)/ -adaptation-common=http://repo.merproject.org/nemo:/%(flavour):/hw:/%(adaptation)-common/%(release)_%(arch)/ -adaptation=http://repo.merproject.org/nemo:/%(flavour):/hw:/%(deviceFamily)/%(release)_%(arch)/ - -[release] - -[rnd] - -[release-flavour] -flavour-pattern=stable - -[testing-flavour] -flavour-pattern=testing - -[devel-flavour] -flavour-pattern=devel - --- ssu/ssu-defaults.ini +++ ssu/ssu-defaults.ini (renamed to nemo-ssu-repos-0.1.2/ssu/ssu-defaults.ini) --- ssu/ssu.ini +++ ssu/ssu.ini (renamed to nemo-ssu-repos-0.1.2/ssu/ssu.ini) --- ssu/ssu.pro +++ ssu/ssu.pro (renamed to nemo-ssu-repos-0.1.2/ssu/ssu.pro)
