[eclipse-yocto] [URGENT PATCH] Remove RSE build dependency

Tim Orling ticotimo at gmail.com
Thu Feb 22 10:30:30 PST 2018 

Merged.

On Thu, Feb 22, 2018 at 1:31 AM, Ang, Chin Huat <chin.huat.ang at intel.com>
wrote:

> My apologies. I should also mentioned that I tried to restart a previously
> passing build, it now fails as o.e.tracecompass.* has once again bumped
> identifier to 201802211448, see:
>
> https://travis-ci.org/ChinHuatAng/eclipse-yocto/builds/344211823
>
> This patch removes the need to update it once and for all.
>
>
> On Feb 22, 2018 5:19 PM, Tim Orling <ticotimo at gmail.com> wrote:
>
> This is not necessarily URGENT. I reserve that flag for patches which are
> required to fix automated builds and therefore which will merge immediately
> without the customary review period. This is just a normal change in my
> mind.
> On Thu, Feb 22, 2018 at 12:27 AM Ang, Chin Huat <chin.huat.ang at intel.com>
> wrote:
>
> Travis-CI build looks good: https://travis-ci.org/
> ChinHuatAng/eclipse-yocto/builds/344682857
>
> --Chin Huat
> ________________________________________
> From: eclipse-yocto-bounces at yoctoproject.org [eclipse-yocto-bounces@
> yoctoproject.org] on behalf of Chin Huat Ang [chin.huat.ang at intel.com]
> Sent: Thursday, February 22, 2018 4:16 PM
> To: eclipse-yocto at yoctoproject.org
> Subject: [eclipse-yocto] [URGENT PATCH] Remove RSE build dependency
>
> Since all features that depend on RSE have been removed, also remove target
> platform and project set file used for setting up RSE-related development.
>
> The root pom.xml is also updated to use poky.target which no longer
> includes
> RSE features.
>
> Signed-off-by: Chin Huat Ang <chin.huat.ang at intel.com>
> ---
>  README.dev                                         |  4 +-
>  pom.xml                                            |  2 +-
>  releng/org.yocto.sdk.releng/launches/poky.launch   |  2 +-
>  releng/org.yocto.sdk.releng/poky.target            | 10 +--
>  releng/org.yocto.sdk.releng/pokywithrse.target     | 85
> ----------------------
>  releng/org.yocto.sdk.releng/pom.xml                |  6 +-
>  .../projectsets/pokywithrse.psf                    | 29 --------
>  7 files changed, 8 insertions(+), 130 deletions(-)
>  delete mode 100644 releng/org.yocto.sdk.releng/pokywithrse.target
>  delete mode 100644 releng/org.yocto.sdk.releng/
> projectsets/pokywithrse.psf
>
> diff --git a/README.dev b/README.dev
> index 49503b6..ba94048 100644
> --- a/README.dev
> +++ b/README.dev
> @@ -96,7 +96,7 @@ Select File radio button and choose 'Browse' button on
> right
>
>  Browse to ~/git/eclipse-poky-contrib/releng/org.yocto.sdk.releng/
> projectsets
>
> -and choose 'pokywithrse.psf' and Finish
> +and choose 'poky.psf' and Finish
>
>  This should result in approximately 11 projects appearing in
>  your workspace.  Some will have compiler errors.
> @@ -105,7 +105,7 @@ your workspace.  Some will have compiler errors.
>
>  In the Eclipse Package Explorer view (or Projects view) navigate
>  to org.yocto.sdk.releng/ directory and open (double click)
> -this file:  pokywithrse.target
> +this file:  poky.target
>
>  Once this file is opened with the 'Target Definition' edito, you should
>  see in the message bar: "Resolving Poky with R...inition" with a
> percentage.
> diff --git a/pom.xml b/pom.xml
> index 11949d8..d4d00fe 100755
> --- a/pom.xml
> +++ b/pom.xml
> @@ -13,7 +13,7 @@
>         <tycho-extras-version>1.0.0</tycho-extras-version>
>         <!-- to find the target platform, this must match the one of the
> classifiers
>         in the releng/org.yocto.sdk.releng/pom.xml -->
> -       <target-platform>pokywithrse</target-platform>
> +       <target-platform>poky</target-platform>
>         <help-docs-eclipserun-repo>http://download.eclipse.org/
> eclipse/updates/4.7</help-docs-eclipserun-repo>
>         <tycho.scmUrl>scm:git:https://github.com/crops/eclipse-poky.git
> </tycho.scmUrl>
>         <base.test.vmargs>-Xms256m -Xmx512m -ea</base.test.vmargs>
> diff --git a/releng/org.yocto.sdk.releng/launches/poky.launch
> b/releng/org.yocto.sdk.releng/launches/poky.launch
> index b86ec6b..fc0c77e 100644
> --- a/releng/org.yocto.sdk.releng/launches/poky.launch
> +++ b/releng/org.yocto.sdk.releng/launches/poky.launch
> @@ -12,7 +12,7 @@
>  <stringAttribute key="configLocation" value="${workspace_loc}/.
> metadata/.plugins/org.eclipse.pde.core/poky"/>
>  <booleanAttribute key="default" value="true"/>
>  <booleanAttribute key="includeOptional" value="true"/>
> -<stringAttribute key="location" value="${workspace_loc}/../
> runtime-pokywithrse"/>
> +<stringAttribute key="location" value="${workspace_loc}/../
> runtime-poky"/>
>  <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD"
> value="true"/>
>  <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER"
> value="org.eclipse.jdt.launching.JRE_CONTAINER/org.
> eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
>  <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS"
> value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${
> target.nl} -consoleLog -console"/>
> diff --git a/releng/org.yocto.sdk.releng/poky.target
> b/releng/org.yocto.sdk.releng/poky.target
> index 487ce9f..dd7cc5a 100644
> --- a/releng/org.yocto.sdk.releng/poky.target
> +++ b/releng/org.yocto.sdk.releng/poky.target
> @@ -1,5 +1,5 @@
>  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
> -<?pde version="3.8"?><target name="Poky w/o RSE" sequenceNumber="33">
> +<?pde version="3.8"?><target name="Poky w/o RSE" sequenceNumber="34">
>  <locations>
>  <location includeAllPlatforms="false" includeConfigurePhase="false"
> includeMode="planner" includeSource="true" type="InstallableUnit">
>  <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
> @@ -27,14 +27,6 @@
>  <repository location="http://download.eclipse.org/linuxtools/update-
> docker-3.2.0"/>
>  </location>
>  <location includeAllPlatforms="false" includeConfigurePhase="false"
> includeMode="planner" includeSource="true" type="InstallableUnit">
> -<unit id="org.eclipse.tracecompass.btf.feature.group"
> version="3.3.0.201802201000"/>
> -<unit id="org.eclipse.tracecompass.gdbtrace.feature.group"
> version="3.3.0.201802201000"/>
> -<unit id="org.eclipse.tracecompass.lttng2.kernel.feature.group"
> version="3.3.0.201802201000"/>
> -<unit id="org.eclipse.tracecompass.lttng2.ust.feature.group"
> version="3.3.0.201802201000"/>
> -<unit id="org.eclipse.tracecompass.tmf.pcap.feature.group"
> version="3.3.0.201802201000"/>
> -<repository location="http://download.eclipse.org/tracecompass/
> oxygen/stable/repository"/>
> -</location>
> -<location includeAllPlatforms="false" includeConfigurePhase="false"
> includeMode="planner" includeSource="true" type="InstallableUnit">
>  <unit id="com.google.gson" version="0.0.0"/>
>  <unit id="net.sourceforge.lpg.lpgjavaruntime" version="0.0.0"/>
>  <unit id="org.antlr.runtime" version="0.0.0"/>
> diff --git a/releng/org.yocto.sdk.releng/pokywithrse.target
> b/releng/org.yocto.sdk.releng/pokywithrse.target
> deleted file mode 100644
> index e6d0f14..0000000
> --- a/releng/org.yocto.sdk.releng/pokywithrse.target
> +++ /dev/null
> @@ -1,85 +0,0 @@
> -<?xml version="1.0" encoding="UTF-8" standalone="no"?>
> -<?pde version="3.8"?><target includeMode="feature" name="Poky With RSE"
> sequenceNumber="28">
> -<locations>
> -<location includeAllPlatforms="false" includeConfigurePhase="false"
> includeMode="planner" includeSource="true" type="InstallableUnit">
> -<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
> -<repository location="http://download.eclipse.org/cbi/updates/license/"/>
> -</location>
> -<location includeAllPlatforms="false" includeConfigurePhase="false"
> includeMode="planner" includeSource="true" type="InstallableUnit">
> -<unit id="org.eclipse.remote.serial.feature.group"
> version="3.0.0.201706052031"/>
> -<repository location="http://download.eclipse.org/tools/ptp/builds/
> remote/oxygen/milestones"/>
> -</location>
> -<location includeAllPlatforms="false" includeConfigurePhase="false"
> includeMode="planner" includeSource="true" type="InstallableUnit">
> -<unit id="org.eclipse.cdt.autotools.feature.group"
> version="9.4.0.201712020452"/>
> -<unit id="org.eclipse.cdt.autotools.source.feature.group"
> version="9.4.0.201712020452"/>
> -<unit id="org.eclipse.cdt.docker.launcher.feature.group"
> version="9.4.0.201712020452"/>
> -<unit id="org.eclipse.cdt.docker.launcher.source.feature.group"
> version="9.4.0.201712020452"/>
> -<unit id="org.eclipse.cdt.launch.remote.feature.group"
> version="9.4.0.201712020452"/>
> -<unit id="org.eclipse.cdt.launch.remote.source.feature.group"
> version="9.4.0.201712020452"/>
> -<unit id="org.eclipse.cdt.sdk.feature.group"
> version="9.4.0.201712020452"/>
> -<unit id="org.eclipse.launchbar.feature.group"
> version="2.2.0.201711162100"/>
> -<unit id="org.eclipse.launchbar.remote.feature.group"
> version="2.2.0.201711162100"/>
> -<repository location="http://download.eclipse.org/tools/cdt/releases/9.4
> "/>
> -</location>
> -<location includeAllPlatforms="false" includeConfigurePhase="false"
> includeMode="planner" includeSource="true" type="InstallableUnit">
> -<unit id="org.eclipse.tm.terminal.control" version="0.0.0"/>
> -<repository location="http://download.eclipse.org/tm/terminal/
> builds/development/nightly/"/>
> -</location>
> -<location includeAllPlatforms="false" includeConfigurePhase="false"
> includeMode="planner" includeSource="true" type="InstallableUnit">
> -<unit id="org.eclipse.linuxtools.docker.feature.feature.group"
> version="3.2.0.201712060514"/>
> -<unit id="org.eclipse.linuxtools.docker.feature.source.feature.group"
> version="3.2.0.201712060514"/>
> -<repository location="http://download.eclipse.org/linuxtools/update-
> docker-3.2.0"/>
> -</location>
> -<location includeAllPlatforms="false" includeConfigurePhase="false"
> includeMode="planner" includeSource="true" type="InstallableUnit">
> -<unit id="org.eclipse.tracecompass.btf.feature.group"
> version="3.3.0.201802201000"/>
> -<unit id="org.eclipse.tracecompass.gdbtrace.feature.group"
> version="3.3.0.201802201000"/>
> -<unit id="org.eclipse.tracecompass.lttng2.kernel.feature.group"
> version="3.3.0.201802201000"/>
> -<unit id="org.eclipse.tracecompass.lttng2.ust.feature.group"
> version="3.3.0.201802201000"/>
> -<unit id="org.eclipse.tracecompass.tmf.pcap.feature.group"
> version="3.3.0.201802201000"/>
> -<repository location="http://download.eclipse.org/tracecompass/
> oxygen/stable/repository"/>
> -</location>
> -<location includeAllPlatforms="false" includeConfigurePhase="false"
> includeMode="planner" includeSource="true" type="InstallableUnit">
> -<unit id="org.eclipse.swtbot.eclipse.feature.group"
> version="2.6.0.201706141832"/>
> -<unit id="org.eclipse.swtbot.feature.group"
> version="2.6.0.201706141832"/>
> -<unit id="org.eclipse.swtbot.ide.feature.group"
> version="2.6.0.201706141832"/>
> -<unit id="org.eclipse.wst.xml_ui.feature.feature.group"
> version="3.9.1.v201707252002"/>
> -<repository location="http://download.eclipse.org/releases/oxygen"/>
> -</location>
> -<location includeAllPlatforms="false" includeConfigurePhase="false"
> includeMode="planner" includeSource="true" type="InstallableUnit">
> -<unit id="com.google.gson" version="0.0.0"/>
> -<unit id="net.sourceforge.lpg.lpgjavaruntime" version="0.0.0"/>
> -<unit id="org.antlr.runtime" version="0.0.0"/>
> -<unit id="org.apache.commons.compress" version="0.0.0"/>
> -<unit id="org.apache.log4j" version="0.0.0"/>
> -<unit id="org.apache.log4j.source" version="0.0.0"/>
> -<unit id="org.freemarker" version="0.0.0"/>
> -<unit id="org.hamcrest" version="0.0.0"/>
> -<unit id="org.hamcrest.core" version="0.0.0"/>
> -<unit id="org.junit" version="0.0.0"/>
> -<unit id="org.junit.source" version="0.0.0"/>
> -<unit id="org.mockito" version="0.0.0"/>
> -<unit id="org.slf4j.impl.log4j12" version="0.0.0"/>
> -<repository location="http://download.eclipse.org/tools/orbit/
> downloads/drops/R20170516192513/repository/"/>
> -</location>
> -<location includeAllPlatforms="false" includeConfigurePhase="false"
> includeMode="planner" includeSource="true" type="InstallableUnit">
> -<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
> -<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
> -<unit id="org.eclipse.test.feature.group" version="0.0.0"/>
> -<repository location="http://download.eclipse.org/eclipse/updates/4.7/"/>
> -</location>
> -<location includeAllPlatforms="false" includeConfigurePhase="false"
> includeMode="planner" includeSource="true" type="InstallableUnit">
> -<unit id="org.eclipse.rse.feature.group" version="3.7.0.201505221634"/>
> -<unit id="org.eclipse.rse.sdk.feature.group"
> version="3.7.0.201505221634"/>
> -<unit id="org.eclipse.rse.terminals.feature.group"
> version="3.8.0.201505221634"/>
> -<unit id="org.eclipse.rse.terminals.source.feature.group"
> version="3.8.0.201505221634"/>
> -<unit id="org.eclipse.rse.useractions.feature.group"
> version="3.7.0.201505221634"/>
> -<repository location="http://download.eclipse.org/tm/updates/4.0"/>
> -</location>
> -</locations>
> -<environment>
> -<os>linux</os>
> -<ws>gtk</ws>
> -<arch>x86_64</arch>
> -<nl>en_US</nl>
> -</environment>
> -</target>
> diff --git a/releng/org.yocto.sdk.releng/pom.xml
> b/releng/org.yocto.sdk.releng/pom.xml
> index 2fc9d40..3fb4357 100755
> --- a/releng/org.yocto.sdk.releng/pom.xml
> +++ b/releng/org.yocto.sdk.releng/pom.xml
> @@ -11,7 +11,7 @@
>         </parent>
>
>         <groupId>org.yocto.releng</groupId>
> -       <artifactId>pokywithrse</artifactId>
> +       <artifactId>poky</artifactId>
>         <packaging>eclipse-target-definition</packaging>
>         <name>Yocto Project Eclipse Poky Target</name>
>
> @@ -31,9 +31,9 @@
>                                                 <configuration>
>                                                         <artifacts>
>                                                                 <artifact>
> -
>  <file>pokywithrse.target</file>
> +
>  <file>poky.target</file>
>
> <type>target</type>
> -
>  <classifier>pokywithrse</classifier>
> +
>  <classifier>poky</classifier>
>                                                                 </artifact>
>                                                         </artifacts>
>                                                 </configuration>
> diff --git a/releng/org.yocto.sdk.releng/projectsets/pokywithrse.psf
> b/releng/org.yocto.sdk.releng/projectsets/pokywithrse.psf
> deleted file mode 100644
> index 9555b73..0000000
> --- a/releng/org.yocto.sdk.releng/projectsets/pokywithrse.psf
> +++ /dev/null
> @@ -1,29 +0,0 @@
> -<?xml version="1.0" encoding="UTF-8"?>
> -<psf version="2.0">
> -<provider id="org.eclipse.egit.core.GitProvider">
> -<project reference="1.0,ssh://git@push.yoctoproject.org/eclipse-poky-
> contrib,master,plugins/org.yocto.cmake.managedbuilder"/>
> -<project reference="1.0,ssh://git@push.yoctoproject.org/eclipse-poky-
> contrib,master,features/org.yocto.doc"/>
> -<project reference="1.0,ssh://git@push.yoctoproject.org/eclipse-poky-
> contrib,master,plugins/org.yocto.doc.user"/>
> -<project reference="1.0,ssh://git@push.yoctoproject.org/eclipse-poky-
> contrib,master,plugins/org.yocto.remote.utils"/>
> -<project reference="1.0,ssh://git@push.yoctoproject.org/eclipse-poky-
> contrib,master,features/org.yocto.sdk"/>
> -<project reference="1.0,ssh://git@push.yoctoproject.org/eclipse-poky-
> contrib,master,plugins/org.yocto.sdk.ide"/>
> -<project reference="1.0,ssh://git@push.yoctoproject.org/eclipse-poky-
> contrib,master,plugins/org.yocto.sdk.ide.doc.user"/>
> -<project reference="1.0,ssh://git@push.yoctoproject.org/eclipse-poky-
> contrib,master,plugins/org.yocto.sdk.remotetools"/>
> -<project reference="1.0,ssh://git@push.yoctoproject.org/eclipse-poky-
> contrib,master,features/org.yocto.utils"/>
> -<project reference="1.0,ssh://git@push.yoctoproject.org/eclipse-poky-
> contrib,master,releng/org.yocto.sdk.releng"/>
> -<project reference="1.0,ssh://git@push.yoctoproject.org/eclipse-poky-
> contrib,master,."/>
> -</provider>
> -<workingSets editPageId="org.eclipse.ui.resourceWorkingSetPage"
> id="1515432086327_1" label="poky-parent" name="poky-parent">
> -<item factoryID="org.eclipse.ui.internal.model.ResourceFactory"
> path="/poky-parent" type="4"/>
> -<item factoryID="org.eclipse.ui.internal.model.ResourceFactory"
> path="/poky" type="4"/>
> -<item factoryID="org.eclipse.ui.internal.model.ResourceFactory"
> path="/org.yocto.sdk.ide" type="4"/>
> -<item factoryID="org.eclipse.ui.internal.model.ResourceFactory"
> path="/org.yocto.sdk.ide.doc.user" type="4"/>
> -<item factoryID="org.eclipse.ui.internal.model.ResourceFactory"
> path="/org.yocto.cmake.managedbuilder" type="4"/>
> -<item factoryID="org.eclipse.ui.internal.model.ResourceFactory"
> path="/org.yocto.remote.utils" type="4"/>
> -<item factoryID="org.eclipse.ui.internal.model.ResourceFactory"
> path="/org.yocto.sdk.remotetools" type="4"/>
> -<item factoryID="org.eclipse.ui.internal.model.ResourceFactory"
> path="/org.yocto.doc.user" type="4"/>
> -<item factoryID="org.eclipse.ui.internal.model.ResourceFactory"
> path="/org.yocto.sdk" type="4"/>
> -<item factoryID="org.eclipse.ui.internal.model.ResourceFactory"
> path="/org.yocto.utils" type="4"/>
> -<item factoryID="org.eclipse.ui.internal.model.ResourceFactory"
> path="/org.yocto.doc" type="4"/>
> -</workingSets>
> -</psf>
> \ No newline at end of file
> --
> 2.7.4
>
> _______________________________________________
> eclipse-yocto mailing list
> eclipse-yocto at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/eclipse-yocto
> _______________________________________________
> eclipse-yocto mailing list
> eclipse-yocto at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/eclipse-yocto
>
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.yoctoproject.org/pipermail/eclipse-yocto/attachments/20180222/8d2d5b6a/attachment-0001.html>

More information about the eclipse-yocto mailing list