Changes - SailfishOS Open Build Service

Changes of Revision 12

[-] [+]	Changed	_service:repo:droid-hal-ace.spec
@@ -13,12 +13,13 @@ # repo service performed : %%include rpm/droid-hal-device.inc # This file should be %%included into a device specific spec file # where macros are defined: -# device: should be the CM codename +# device: should be the CM codename or the AOSP TARGET_PRODUCT # vendor: determine the directory used for ./device/<vendor>/<device> # device_pretty: User-visible model name of the device # vendor_pretty: User-visible manufacturer name of the device # hadk_make_target: the target used when running make in the HABUILD_SDK on the OBS. Defaults to "hybris-hal" # device_target_cpu: Used for native builds. Normally the nested droid build env will do an old-fashioned cross-compile and produce non-x86 binaries (default armv7hl). This can be set to tell OBS what arch the binaries are. Eg Android for Intel arch must set this. +# device_variant: for AOSP this is used as the TARGET_BUILD_VARIANT for lunch %define __provides_exclude_from ^%{_libexecdir}/droid-hybris/.*$ %define android_root . @@ -273,7 +274,7 @@ %if 0%{?_obs_build_project:1} # Hadk style build of android on OBS echo Running droid build in HABUILD_SDK -ubu-chroot -r /srv/mer/sdks/ubu "cd %android_root; source build/envsetup.sh; lunch %{device}; rm -f .repo/local_manifests/roomservice.xml; make %{?_smp_mflags} %{?hadk_make_target}%{!?hadk_make_target:hybris-hal}" +ubu-chroot -r /srv/mer/sdks/ubu "cd %android_root; source build/envsetup.sh; lunch %{device}%{?device_variant}; rm -f .repo/local_manifests/roomservice.xml; make %{?_smp_mflags} %{?hadk_make_target}%{!?hadk_make_target:hybris-hal}" %endif # Make a tmp location for built installables
[-] [+]	Changed	_service:repo:droid-hal-grouper.spec ^
@@ -15,12 +15,13 @@ # repo service performed : %%include rpm/droid-hal-device.inc # This file should be %%included into a device specific spec file # where macros are defined: -# device: should be the CM codename +# device: should be the CM codename or the AOSP TARGET_PRODUCT # vendor: determine the directory used for ./device/<vendor>/<device> # device_pretty: User-visible model name of the device # vendor_pretty: User-visible manufacturer name of the device # hadk_make_target: the target used when running make in the HABUILD_SDK on the OBS. Defaults to "hybris-hal" # device_target_cpu: Used for native builds. Normally the nested droid build env will do an old-fashioned cross-compile and produce non-x86 binaries (default armv7hl). This can be set to tell OBS what arch the binaries are. Eg Android for Intel arch must set this. +# device_variant: for AOSP this is used as the TARGET_BUILD_VARIANT for lunch %define __provides_exclude_from ^%{_libexecdir}/droid-hybris/.*$ %define android_root . @@ -275,7 +276,7 @@ %if 0%{?_obs_build_project:1} # Hadk style build of android on OBS echo Running droid build in HABUILD_SDK -ubu-chroot -r /srv/mer/sdks/ubu "cd %android_root; source build/envsetup.sh; lunch %{device}; rm -f .repo/local_manifests/roomservice.xml; make %{?_smp_mflags} %{?hadk_make_target}%{!?hadk_make_target:hybris-hal}" +ubu-chroot -r /srv/mer/sdks/ubu "cd %android_root; source build/envsetup.sh; lunch %{device}%{?device_variant}; rm -f .repo/local_manifests/roomservice.xml; make %{?_smp_mflags} %{?hadk_make_target}%{!?hadk_make_target:hybris-hal}" %endif # Make a tmp location for built installables
[-] [+]	Changed	_service:repo:droid-hal-hammerhead.spec ^
@@ -18,12 +18,13 @@ # repo service performed : %%include rpm/droid-hal-device.inc # This file should be %%included into a device specific spec file # where macros are defined: -# device: should be the CM codename +# device: should be the CM codename or the AOSP TARGET_PRODUCT # vendor: determine the directory used for ./device/<vendor>/<device> # device_pretty: User-visible model name of the device # vendor_pretty: User-visible manufacturer name of the device # hadk_make_target: the target used when running make in the HABUILD_SDK on the OBS. Defaults to "hybris-hal" # device_target_cpu: Used for native builds. Normally the nested droid build env will do an old-fashioned cross-compile and produce non-x86 binaries (default armv7hl). This can be set to tell OBS what arch the binaries are. Eg Android for Intel arch must set this. +# device_variant: for AOSP this is used as the TARGET_BUILD_VARIANT for lunch %define __provides_exclude_from ^%{_libexecdir}/droid-hybris/.*$ %define android_root . @@ -278,7 +279,7 @@ %if 0%{?_obs_build_project:1} # Hadk style build of android on OBS echo Running droid build in HABUILD_SDK -ubu-chroot -r /srv/mer/sdks/ubu "cd %android_root; source build/envsetup.sh; lunch %{device}; rm -f .repo/local_manifests/roomservice.xml; make %{?_smp_mflags} %{?hadk_make_target}%{!?hadk_make_target:hybris-hal}" +ubu-chroot -r /srv/mer/sdks/ubu "cd %android_root; source build/envsetup.sh; lunch %{device}%{?device_variant}; rm -f .repo/local_manifests/roomservice.xml; make %{?_smp_mflags} %{?hadk_make_target}%{!?hadk_make_target:hybris-hal}" %endif # Make a tmp location for built installables
[-] [+]	Changed	_service:repo:droid-hal-i9305.spec ^
@@ -18,12 +18,13 @@ # repo service performed : %%include rpm/droid-hal-device.inc # This file should be %%included into a device specific spec file # where macros are defined: -# device: should be the CM codename +# device: should be the CM codename or the AOSP TARGET_PRODUCT # vendor: determine the directory used for ./device/<vendor>/<device> # device_pretty: User-visible model name of the device # vendor_pretty: User-visible manufacturer name of the device # hadk_make_target: the target used when running make in the HABUILD_SDK on the OBS. Defaults to "hybris-hal" # device_target_cpu: Used for native builds. Normally the nested droid build env will do an old-fashioned cross-compile and produce non-x86 binaries (default armv7hl). This can be set to tell OBS what arch the binaries are. Eg Android for Intel arch must set this. +# device_variant: for AOSP this is used as the TARGET_BUILD_VARIANT for lunch %define __provides_exclude_from ^%{_libexecdir}/droid-hybris/.*$ %define android_root . @@ -278,7 +279,7 @@ %if 0%{?_obs_build_project:1} # Hadk style build of android on OBS echo Running droid build in HABUILD_SDK -ubu-chroot -r /srv/mer/sdks/ubu "cd %android_root; source build/envsetup.sh; lunch %{device}; rm -f .repo/local_manifests/roomservice.xml; make %{?_smp_mflags} %{?hadk_make_target}%{!?hadk_make_target:hybris-hal}" +ubu-chroot -r /srv/mer/sdks/ubu "cd %android_root; source build/envsetup.sh; lunch %{device}%{?device_variant}; rm -f .repo/local_manifests/roomservice.xml; make %{?_smp_mflags} %{?hadk_make_target}%{!?hadk_make_target:hybris-hal}" %endif # Make a tmp location for built installables
[-] [+]	Changed	_service:repo:droid-hal-maguro.spec ^
@@ -16,12 +16,13 @@ # repo service performed : %%include rpm/droid-hal-device.inc # This file should be %%included into a device specific spec file # where macros are defined: -# device: should be the CM codename +# device: should be the CM codename or the AOSP TARGET_PRODUCT # vendor: determine the directory used for ./device/<vendor>/<device> # device_pretty: User-visible model name of the device # vendor_pretty: User-visible manufacturer name of the device # hadk_make_target: the target used when running make in the HABUILD_SDK on the OBS. Defaults to "hybris-hal" # device_target_cpu: Used for native builds. Normally the nested droid build env will do an old-fashioned cross-compile and produce non-x86 binaries (default armv7hl). This can be set to tell OBS what arch the binaries are. Eg Android for Intel arch must set this. +# device_variant: for AOSP this is used as the TARGET_BUILD_VARIANT for lunch %define __provides_exclude_from ^%{_libexecdir}/droid-hybris/.*$ %define android_root . @@ -276,7 +277,7 @@ %if 0%{?_obs_build_project:1} # Hadk style build of android on OBS echo Running droid build in HABUILD_SDK -ubu-chroot -r /srv/mer/sdks/ubu "cd %android_root; source build/envsetup.sh; lunch %{device}; rm -f .repo/local_manifests/roomservice.xml; make %{?_smp_mflags} %{?hadk_make_target}%{!?hadk_make_target:hybris-hal}" +ubu-chroot -r /srv/mer/sdks/ubu "cd %android_root; source build/envsetup.sh; lunch %{device}%{?device_variant}; rm -f .repo/local_manifests/roomservice.xml; make %{?_smp_mflags} %{?hadk_make_target}%{!?hadk_make_target:hybris-hal}" %endif # Make a tmp location for built installables
[-] [+]	Changed	_service:repo:droid-hal-mako.spec ^
@@ -11,12 +11,13 @@ # repo service performed : %%include rpm/droid-hal-device.inc # This file should be %%included into a device specific spec file # where macros are defined: -# device: should be the CM codename +# device: should be the CM codename or the AOSP TARGET_PRODUCT # vendor: determine the directory used for ./device/<vendor>/<device> # device_pretty: User-visible model name of the device # vendor_pretty: User-visible manufacturer name of the device # hadk_make_target: the target used when running make in the HABUILD_SDK on the OBS. Defaults to "hybris-hal" # device_target_cpu: Used for native builds. Normally the nested droid build env will do an old-fashioned cross-compile and produce non-x86 binaries (default armv7hl). This can be set to tell OBS what arch the binaries are. Eg Android for Intel arch must set this. +# device_variant: for AOSP this is used as the TARGET_BUILD_VARIANT for lunch %define __provides_exclude_from ^%{_libexecdir}/droid-hybris/.*$ %define android_root . @@ -271,7 +272,7 @@ %if 0%{?_obs_build_project:1} # Hadk style build of android on OBS echo Running droid build in HABUILD_SDK -ubu-chroot -r /srv/mer/sdks/ubu "cd %android_root; source build/envsetup.sh; lunch %{device}; rm -f .repo/local_manifests/roomservice.xml; make %{?_smp_mflags} %{?hadk_make_target}%{!?hadk_make_target:hybris-hal}" +ubu-chroot -r /srv/mer/sdks/ubu "cd %android_root; source build/envsetup.sh; lunch %{device}%{?device_variant}; rm -f .repo/local_manifests/roomservice.xml; make %{?_smp_mflags} %{?hadk_make_target}%{!?hadk_make_target:hybris-hal}" %endif # Make a tmp location for built installables
[-] [+]	Changed	_service:repo:droid-hal-n7000.spec ^
@@ -6,12 +6,13 @@ # repo service performed : %%include rpm/droid-hal-device.inc # This file should be %%included into a device specific spec file # where macros are defined: -# device: should be the CM codename +# device: should be the CM codename or the AOSP TARGET_PRODUCT # vendor: determine the directory used for ./device/<vendor>/<device> # device_pretty: User-visible model name of the device # vendor_pretty: User-visible manufacturer name of the device # hadk_make_target: the target used when running make in the HABUILD_SDK on the OBS. Defaults to "hybris-hal" # device_target_cpu: Used for native builds. Normally the nested droid build env will do an old-fashioned cross-compile and produce non-x86 binaries (default armv7hl). This can be set to tell OBS what arch the binaries are. Eg Android for Intel arch must set this. +# device_variant: for AOSP this is used as the TARGET_BUILD_VARIANT for lunch %define __provides_exclude_from ^%{_libexecdir}/droid-hybris/.*$ %define android_root . @@ -266,7 +267,7 @@ %if 0%{?_obs_build_project:1} # Hadk style build of android on OBS echo Running droid build in HABUILD_SDK -ubu-chroot -r /srv/mer/sdks/ubu "cd %android_root; source build/envsetup.sh; lunch %{device}; rm -f .repo/local_manifests/roomservice.xml; make %{?_smp_mflags} %{?hadk_make_target}%{!?hadk_make_target:hybris-hal}" +ubu-chroot -r /srv/mer/sdks/ubu "cd %android_root; source build/envsetup.sh; lunch %{device}%{?device_variant}; rm -f .repo/local_manifests/roomservice.xml; make %{?_smp_mflags} %{?hadk_make_target}%{!?hadk_make_target:hybris-hal}" %endif # Make a tmp location for built installables
[-] [+]	Changed	_service:repo:droid-hal-nuc.spec ^
@@ -1,6 +1,6 @@ # device is the codename for the device # eg mako = Nexus 4 -%define device baytrail_generic-eng +%define device baytrail_generic # vendor is used in device/%vendor/%device/ %define vendor intel @@ -11,15 +11,18 @@ # This not an armv7hl so be explicit %define device_target_cpu i586 +%define device-variant -eng + # repo service performed : %%include rpm/droid-hal-device.inc # This file should be %%included into a device specific spec file # where macros are defined: -# device: should be the CM codename +# device: should be the CM codename or the AOSP TARGET_PRODUCT # vendor: determine the directory used for ./device/<vendor>/<device> # device_pretty: User-visible model name of the device # vendor_pretty: User-visible manufacturer name of the device # hadk_make_target: the target used when running make in the HABUILD_SDK on the OBS. Defaults to "hybris-hal" # device_target_cpu: Used for native builds. Normally the nested droid build env will do an old-fashioned cross-compile and produce non-x86 binaries (default armv7hl). This can be set to tell OBS what arch the binaries are. Eg Android for Intel arch must set this. +# device_variant: for AOSP this is used as the TARGET_BUILD_VARIANT for lunch %define __provides_exclude_from ^%{_libexecdir}/droid-hybris/.*$ %define android_root . @@ -274,7 +277,7 @@ %if 0%{?_obs_build_project:1} # Hadk style build of android on OBS echo Running droid build in HABUILD_SDK -ubu-chroot -r /srv/mer/sdks/ubu "cd %android_root; source build/envsetup.sh; lunch %{device}; rm -f .repo/local_manifests/roomservice.xml; make %{?_smp_mflags} %{?hadk_make_target}%{!?hadk_make_target:hybris-hal}" +ubu-chroot -r /srv/mer/sdks/ubu "cd %android_root; source build/envsetup.sh; lunch %{device}%{?device_variant}; rm -f .repo/local_manifests/roomservice.xml; make %{?_smp_mflags} %{?hadk_make_target}%{!?hadk_make_target:hybris-hal}" %endif # Make a tmp location for built installables
[-] [+]	Changed	_service:repo:droid-hal-p3110.spec ^
@@ -6,12 +6,13 @@ # repo service performed : %%include rpm/droid-hal-device.inc # This file should be %%included into a device specific spec file # where macros are defined: -# device: should be the CM codename +# device: should be the CM codename or the AOSP TARGET_PRODUCT # vendor: determine the directory used for ./device/<vendor>/<device> # device_pretty: User-visible model name of the device # vendor_pretty: User-visible manufacturer name of the device # hadk_make_target: the target used when running make in the HABUILD_SDK on the OBS. Defaults to "hybris-hal" # device_target_cpu: Used for native builds. Normally the nested droid build env will do an old-fashioned cross-compile and produce non-x86 binaries (default armv7hl). This can be set to tell OBS what arch the binaries are. Eg Android for Intel arch must set this. +# device_variant: for AOSP this is used as the TARGET_BUILD_VARIANT for lunch %define __provides_exclude_from ^%{_libexecdir}/droid-hybris/.*$ %define android_root . @@ -266,7 +267,7 @@ %if 0%{?_obs_build_project:1} # Hadk style build of android on OBS echo Running droid build in HABUILD_SDK -ubu-chroot -r /srv/mer/sdks/ubu "cd %android_root; source build/envsetup.sh; lunch %{device}; rm -f .repo/local_manifests/roomservice.xml; make %{?_smp_mflags} %{?hadk_make_target}%{!?hadk_make_target:hybris-hal}" +ubu-chroot -r /srv/mer/sdks/ubu "cd %android_root; source build/envsetup.sh; lunch %{device}%{?device_variant}; rm -f .repo/local_manifests/roomservice.xml; make %{?_smp_mflags} %{?hadk_make_target}%{!?hadk_make_target:hybris-hal}" %endif # Make a tmp location for built installables
[-] [+]	Changed	_service ^
@@ -2,6 +2,6 @@ <service name="repo"> <param name="initrepo">lbt/android</param> <param name="branch">android-ia</param> - <param name="service">github</param> + <param name="service">github</param> </service> </services> \ No newline at end of file
[-] [+]	Changed	_service:repo:droid-hal-device.inc ^
@@ -1,11 +1,12 @@ # This file should be %%included into a device specific spec file # where macros are defined: -# device: should be the CM codename +# device: should be the CM codename or the AOSP TARGET_PRODUCT # vendor: determine the directory used for ./device/<vendor>/<device> # device_pretty: User-visible model name of the device # vendor_pretty: User-visible manufacturer name of the device # hadk_make_target: the target used when running make in the HABUILD_SDK on the OBS. Defaults to "hybris-hal" # device_target_cpu: Used for native builds. Normally the nested droid build env will do an old-fashioned cross-compile and produce non-x86 binaries (default armv7hl). This can be set to tell OBS what arch the binaries are. Eg Android for Intel arch must set this. +# device_variant: for AOSP this is used as the TARGET_BUILD_VARIANT for lunch %define __provides_exclude_from ^%{_libexecdir}/droid-hybris/.*$ %define android_root . @@ -260,7 +261,7 @@ %if 0%{?_obs_build_project:1} # Hadk style build of android on OBS echo Running droid build in HABUILD_SDK -ubu-chroot -r /srv/mer/sdks/ubu "cd %android_root; source build/envsetup.sh; lunch %{device}; rm -f .repo/local_manifests/roomservice.xml; make %{?_smp_mflags} %{?hadk_make_target}%{!?hadk_make_target:hybris-hal}" +ubu-chroot -r /srv/mer/sdks/ubu "cd %android_root; source build/envsetup.sh; lunch %{device}%{?device_variant}; rm -f .repo/local_manifests/roomservice.xml; make %{?_smp_mflags} %{?hadk_make_target}%{!?hadk_make_target:hybris-hal}" %endif # Make a tmp location for built installables
	Changed	_service:repo:repo.tar.bzip2 ^
	Changed	_service:repo:rpm.tar.bzip2 ^