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/7451 Thank You, Marko Saukko [This message was auto-generated] --- Request # 7451: Messages from BOSS: State: review at 2012-11-27T14:32:37 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 @@ -0,0 +1,5 @@ +* 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 + old: ---- nemo-ssu-repos-0.1.tar.gz new: ---- nemo-ssu-repos-0.1.1.tar.gz spec files: ----------- --- nemo-ssu-repos.spec +++ nemo-ssu-repos.spec @@ -1,5 +1,5 @@ Name: nemo-ssu-repos -Version: 0.1 +Version: 0.1.1 Release: 1 Summary: Nemo SSU repositories URL: https://github.com/nemomobile/nemo-ssu-repos @@ -12,9 +12,6 @@ %description %{summary}. -%files -%defattr(-,root,root,-) - %package -n ssu-vendor-data-nemo Summary: Sample vendor configuration data @@ -62,20 +59,19 @@ %config %{_sysconfdir}/zypp/repos.d/adaptation-release.repo -%package adaptation-extra-release -Summary: Additional adaptation repositories +%package adaptation-common-release +Summary: Common adaptation repositories Group: System/Base Requires: ssu -%description adaptation-extra-release -This package provides additional adaptation repositories for -devices using more than one common adaptation repository. -Configuration for the main common adaptation is already included -in the adaptation-release package. +%description adaptation-common-release +This package provides common adaptation repositories for +devices using common adaptation repo in addition to normal +adaptation repository. -%files adaptation-extra-release +%files adaptation-common-release %defattr(-,root,root,-) -%config %{_sysconfdir}/zypp/repos.d/adaptation-extra-release.repo +%config %{_sysconfdir}/zypp/repos.d/adaptation-common-release.repo %package rnd @@ -110,20 +106,19 @@ %config %{_sysconfdir}/zypp/repos.d/adaptation-rnd.repo -%package adaptation-extra-rnd -Summary: Additional adaptation repositories +%package adaptation-common-rnd +Summary: Common adaptation repositories Group: System/Base Requires: ssu -%description adaptation-extra-rnd -This package provides additional adaptation repositories for -devices using more than one common adaptation repository. -Configuration for the main common adaptation is already included -in the adaptation-rnd package. +%description adaptation-common-rnd +This package provides common adaptation repositories for +devices using common adaptation repo in addition to normal +adaptation repository. -%files adaptation-extra-rnd +%files adaptation-common-rnd %defattr(-,root,root,-) -%config %{_sysconfdir}/zypp/repos.d/adaptation-extra-rnd.repo +%config %{_sysconfdir}/zypp/repos.d/adaptation-common-rnd.repo %prep @@ -137,7 +132,7 @@ %install make INSTALL_ROOT=%{buildroot} install -RND_REPOS="nemo mer-core adaptation adaptation-extra"; \ +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 other changes: -------------- ++++++ nemo-ssu-repos-0.1.tar.gz -> nemo-ssu-repos-0.1.1.tar.gz --- repos/adaptation-common-rnd.repo +++ repos/adaptation-common-rnd.repo @@ -0,0 +1,7 @@ +[adaptation-common-rnd] +name=adaptation-common-rnd +failovermethod=priority +baseurl=plugin:ssu?rnd&repo=adaptation-common +type=rpm-md +gpgcheck=0 +enabled=1 --- repos/adaptation-extra-rnd.repo +++ repos/adaptation-extra-rnd.repo @@ -1,71 +0,0 @@ -[adaptation-common-extra-1] -name=adaptation-common-extra-1 -failovermethod=priority -baseurl=plugin:ssu?rnd&repo=adaptation-common-extra&extra=1 -type=rpm-md -gpgcheck=0 -enabled=0 - -[adaptation-common-extra-2] -name=adaptation-common-extra-2 -failovermethod=priority -baseurl=plugin:ssu?rnd&repo=adaptation-common-extra&extra=2 -type=rpm-md -gpgcheck=0 -enabled=0 - -[adaptation-common-extra-3] -name=adaptation-common-extra-3 -failovermethod=priority -baseurl=plugin:ssu?rnd&repo=adaptation-common-extra&extra=3 -type=rpm-md -gpgcheck=0 -enabled=0 - -[adaptation-common-extra-4] -name=adaptation-common-extra-4 -failovermethod=priority -baseurl=plugin:ssu?rnd&repo=adaptation-common-extra&extra=4 -type=rpm-md -gpgcheck=0 -enabled=0 - -[adaptation-common-extra-5] -name=adaptation-common-extra-5 -failovermethod=priority -baseurl=plugin:ssu?rnd&repo=adaptation-common-extra&extra=5 -type=rpm-md -gpgcheck=0 -enabled=0 - -[adaptation-common-extra-6] -name=adaptation-common-extra-6 -failovermethod=priority -baseurl=plugin:ssu?rnd&repo=adaptation-common-extra&extra=6 -type=rpm-md -gpgcheck=0 -enabled=0 - -[adaptation-common-extra-7] -name=adaptation-common-extra-7 -failovermethod=priority -baseurl=plugin:ssu?rnd&repo=adaptation-common-extra&extra=7 -type=rpm-md -gpgcheck=0 -enabled=0 - -[adaptation-common-extra-8] -name=adaptation-common-extra-8 -failovermethod=priority -baseurl=plugin:ssu?rnd&repo=adaptation-common-extra&extra=8 -type=rpm-md -gpgcheck=0 -enabled=0 - -[adaptation-common-extra-9] -name=adaptation-common-extra-9 -failovermethod=priority -baseurl=plugin:ssu?rnd&repo=adaptation-common-extra&extra=9 -type=rpm-md -gpgcheck=0 -enabled=0 --- repos/adaptation-rnd.repo +++ repos/adaptation-rnd.repo @@ -4,12 +4,4 @@ baseurl=plugin:ssu?rnd&repo=adaptation type=rpm-md gpgcheck=0 -enabled=0 - -[adaptation-common-main] -name=adaptation-common-main -failovermethod=priority -baseurl=plugin:ssu?rnd&repo=adaptation-common-main -type=rpm-md -gpgcheck=0 -enabled=0 +enabled=1 --- repos/mer-core-rnd.repo +++ repos/mer-core-rnd.repo @@ -5,6 +5,7 @@ baseurl=plugin:ssu?rnd&repo=mer-core type=rpm-md gpgcheck=0 + [mer-core-rnd-debuginfo] name=mer-core-rnd-debuginfo enabled=0 --- repos/nemo-rnd.repo +++ repos/nemo-rnd.repo @@ -1,55 +1,24 @@ -[ce-utils-rnd] -name=ce-utils-rnd +[nemo-mw-rnd] +name=nemo-mw-rnd failovermethod=priority -baseurl=plugin:ssu?rnd&repo=ce-utils +baseurl=plugin:ssu?rnd&repo=nemo-mw type=rpm-md gpgcheck=0 enabled=1 -[ce-mw-shared-rnd] -name=ce-mw-shared-rnd +[nemo-apps-rnd] +name=nemo-apps-rnd failovermethod=priority -baseurl=plugin:ssu?rnd&repo=ce-mw-shared +baseurl=plugin:ssu?rnd&repo=nemo-apps type=rpm-md gpgcheck=0 enabled=1 -[ce-mw-mtf-rnd] -name=ce-mw-mtf-rnd +[nemo-ux-rnd] +name=nemo-ux-rnd failovermethod=priority -baseurl=plugin:ssu?rnd&repo=ce-mw-mtf +baseurl=plugin:ssu?rnd&repo=nemo-ux type=rpm-md gpgcheck=0 enabled=1 -[ce-apps-rnd] -name=ce-apps-rnd -failovermethod=priority -baseurl=plugin:ssu?rnd&repo=ce-apps -type=rpm-md -gpgcheck=0 -enabled=1 - -[ce-apps-mtf-rnd] -name=ce-apps-mtf-rnd -failovermethod=priority -baseurl=plugin:ssu?rnd&repo=ce-apps-mtf -type=rpm-md -gpgcheck=0 -enabled=1 - -[ce-ux-mtf-rnd] -name=ce-ux-mtf-rnd -failovermethod=priority -baseurl=plugin:ssu?rnd&repo=ce-ux-mtf -type=rpm-md -gpgcheck=0 -enabled=1 - -[ce-mtf-tracker-related-apps-rnd] -name=ce-mtf-tracker-related-apps-rnd -failovermethod=priority -baseurl=plugin:ssu?rnd&repo=ce-mtf-tracker-related-apps -type=rpm-md -gpgcheck=0 -enabled=1 \ No newline at end of file --- ssu/board-mappings.ini +++ ssu/board-mappings.ini @@ -0,0 +1,68 @@ +### 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 @@ -45,36 +45,23 @@ [all] credentials= -#move to release/rnd after moving to new obs, with proper release split -ce-utils=http://repo.pub.meego.com/CE:/Utils/Mer_Core_%(arch)/ -ce-mw-shared=http://repo.pub.meego.com/CE:/MW:/Shared/Mer_Core_%(arch)/ -ce-mw-mtf=http://repo.pub.meego.com/CE:/MW:/MTF/CE_MW_Shared_%(arch)/ -ce-apps=http://repo.pub.meego.com/CE:/Apps/CE_MW_Shared_%(arch)/ -ce-apps-mtf=http://repo.pub.meego.com/CE:/Apps:/MTF/CE_MW_MTF_%(arch)/ -ce-ux-mtf=http://repo.pub.meego.com/CE:/UX:/MTF/CE_MW_MTF_%(arch)/ -ce-mtf-tracker-related-apps=http://repo.pub.meego.com/Project:/MTF:/Tracker/CE_UX_MTF_%(arch)/ -#TODO: adaptation specific repositories are currently not properly handled -ce-adaptation-n9xx-common=http://repo.pub.meego.com/CE:/Adaptation:/N9xx-common/Mer_Core_%(arch)/ -ce-adaptation-n950-n9=http://repo.pub.meego.com/CE:/Adaptation:/N950-N9/CE_Adaptation_N9xx-common_%(arch)/ - - -[release] mer-core=http://releases.merproject.org/releases/%(release)/builds/%(arch)/%(debugSplit)/ -adaptation-common-main=https://releases.example.com/releases/%(release)/nemo/adaptation-%(deviceFamily)-common/%(arch)/ -adaptation=https://releases.example.com/releases/%(release)/nemo/adaptation-%(adaptation)/%(arch)/ +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] -mer-core=http://releases.merproject.org/releases/%(release)/builds/%(arch)/%(debugSplit)/ -adaptation-common-main=https://releases.example.com/nemo/%(release)/adaptation-%(adaptation)-common/%(arch)/ -adaptation=https://releases.example.com/nemo/%(release)/adaptation-%(deviceFamily)/%(arch)/ - - -[devel-flavour] -flavour-pattern= [release-flavour] -flavour-pattern=:/release +flavour-pattern=stable [testing-flavour] -flavour-pattern=:/testing +flavour-pattern=testing + +[devel-flavour] +flavour-pattern=devel + --- ssu/ssu.pro +++ ssu/ssu.pro @@ -3,7 +3,7 @@ config.files = ssu.ini config.path = /etc/ssu -static_config.files = repos.ini ssu-defaults.ini +static_config.files = repos.ini ssu-defaults.ini board-mappings.ini static_config.path = /usr/share/ssu INSTALLS += config static_config
