[yocto] [meta-swupd][PATCH] swupd-image: Fix files ownership if IMAGE_BASENAME is not default
From: Piotr Figiel
In case IMAGE_BASENAME is set on image recipe level the files ownership on
target rootfs is incorrect for recipes inheriting swupd-image.bbclass.
Depending on the context swupd-image.bbclass used either PN (PN_BASE) or
IMAGE_BASENAME when generating path to pseudo shared state directory. This
seems correct only when IMAGE_BASENAME is not set as it defaults to PN.
This patch resolves above problem.
Addresses [YOCTO #10108].
Signed-off-by: Piotr Figiel
---
classes/swupd-image.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/classes/swupd-image.bbclass b/classes/swupd-image.bbclass
index 08ab3f5..ed9bd24 100644
--- a/classes/swupd-image.bbclass
+++ b/classes/swupd-image.bbclass
@@ -81,7 +81,7 @@ python () {
# Because real image building via SWUPD_IMAGES can happen also after
# the initial "bitbake " invocation, we have to keep that
# pseudo database around and cannot delete it.
-pseudo_state = d.expand('${TMPDIR}/work-shared/${PN_BASE}/pseudo')
+pseudo_state =
d.expand('${TMPDIR}/work-shared/${IMAGE_BASENAME}/pseudo')
d.setVar('PSEUDO_LOCALSTATEDIR', pseudo_state)
# Non mega virtual images must depend on the mega image having been
--
1.9.1
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] Krogoth, Beaglebone Black, LCD...seeking direction
My overall goal is to get the 4D 4.3" LCD cape working on the BBB, with Yocto and Qt5 linuxfb. I've got Krogoth/core-image-sato booting on the BBB using the standard Yocto BSP, but there's no sign of activity on the LCD. I'm more than a bit confused about the direction in which I should proceed; it seems like there are several options but all/some are obsolete or losing favor. Recognizing that much of this is a matter of opinion, I'm looking for the path of least resistance to accomplish my goal and have something that's maintainable. Are the "cape manager" and "device trees" opposing solutions to enabling the operating system to recognize and access the LCD ? Which should I pursue on the Krogoth 4.4 kernel? Any good reference links available to configure either? I like the idea of a minimal build and adding in only what's necessary, but am I shooting myself in the foot by going with the reference BSP instead of something like the TI SDK? or Angstrom? John -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] [meta][PATCH v2] python-3.4-manifest: Add some missing RDEPENDS
In case anyone is interested, I posted an update for both the script and .inc to openembedded-core (which now has master at python 3.5), but it doesn't seem to have gone anywhere yet. http://lists.openembedded.org/pipermail/openembedded-core/2016-August/124672.html On Mon, Aug 1, 2016 at 9:56 AM, Khem Raj wrote: > and when patch is ready send it to openembedded-core ml > > On Mon, Aug 1, 2016 at 6:49 AM, Kyle Russell > wrote: > > Well, that makes sense. I'm just tripping all over this one. > > > > On Mon, Aug 1, 2016 at 8:29 AM, Burton, Ross > wrote: > >> > >> > >> On 1 August 2016 at 13:01, Kyle Russell wrote: > >>> > >>> scripts/contrib/python/generate-manifest-3.4.py | 10 +- > >> > >> > >> Sorry, but you need to edit the script and then run the script, so the > >> patch contains both the script and inc file changes. > >> > >> Ross > > > > > > > > -- > > ___ > > yocto mailing list > > yocto@yoctoproject.org > > https://lists.yoctoproject.org/listinfo/yocto > > > -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [eclipse-poky][PATCH 0/8] Add neon-master
[YOCTO #9562] Minimum required java version for Neon is 1.8. [YOCTO #9907] Update to latest Eclipse release (Neon v4.6). [YOCTO #9908] Cleanup excessive number of compiler warnings. This series is also staged at: http://git.yoctoproject.org/cgit/cgit.cgi/eclipse-poky-contrib/log/?h=neon-master-next Tim Orling (8): Update to Neon (4.6.0) release fix the build add script to update java version; update all to JavaSE-1.8 org.yocto.sdk/feature.xml: clean up unused dependencies org.yocto.bc.ui: cleanup unused imports; fix generics warnings org.yocto.remote.utils: fix or supress warnings org.yocto.sdk.ide: remove InvokeAction usage org.yocto.sdk.remotetools: SubProgressMonitor -> SubMonitor .../org.yocto.bc.headless.build/build.properties | 4 +- .../org.yocto.doc.headless.build/build.properties | 4 +- .../org.yocto.sdk.headless.build/build.properties | 4 +- features/org.yocto.sdk/feature.xml | 3 - .../build.properties | 4 +- plugins/org.yocto.bc.ui/.classpath | 2 +- plugins/org.yocto.bc.ui/META-INF/MANIFEST.MF | 6 +- .../src/org/yocto/bc/bitbake/BBRecipe.java | 12 +- .../src/org/yocto/bc/bitbake/BBSession.java| 126 +++-- .../org/yocto/bc/bitbake/ProjectInfoHelper.java| 3 - .../src/org/yocto/bc/ui/Activator.java | 37 +++--- .../ui/actions/AbstractBitbakeCommandAction.java | 5 +- .../yocto/bc/ui/actions/LaunchToasterDialog.java | 17 +-- .../bc/ui/actions/LaunchVariableWizardAction.java | 3 +- .../org/yocto/bc/ui/builder/BitbakeBuilder.java| 6 +- .../yocto/bc/ui/builder/ToggleNatureAction.java| 5 +- .../src/org/yocto/bc/ui/decorators/ReadOnly.java | 9 +- .../bc/ui/editors/bitbake/BBVariableTextHover.java | 2 +- .../yocto/bc/ui/filesystem/CustomLocalFile.java| 1 + .../src/org/yocto/bc/ui/filesystem/OEFile.java | 4 +- .../org/yocto/bc/ui/filesystem/OEFileSystem.java | 6 +- .../org/yocto/bc/ui/filesystem/OEIgnoreFile.java | 11 +- .../src/org/yocto/bc/ui/filesystem/Policy.java | 4 +- .../perspectives/BitbakeCommanderPerspective.java | 13 +-- .../org/yocto/bc/ui/popup/actions/NewAction.java | 1 - .../yocto/bc/ui/views/RecipeContentProvider.java | 7 +- .../src/org/yocto/bc/ui/views/RecipeView.java | 2 - .../bc/ui/wizards/BitbakeRecipeUIElement.java | 6 +- .../org/yocto/bc/ui/wizards/FiniteStateWizard.java | 10 +- .../yocto/bc/ui/wizards/FiniteStateWizardPage.java | 26 ++--- .../bc/ui/wizards/NewBitBakeFileRecipeWizard.java | 5 +- .../ui/wizards/NewBitBakeFileRecipeWizardPage.java | 13 +-- .../ui/wizards/importProject/BBCProjectPage.java | 2 +- .../importProject/ImportYoctoProjectWizard.java| 11 +- .../yocto/bc/ui/wizards/install/InstallWizard.java | 16 +-- .../yocto/bc/ui/wizards/install/OptionsPage.java | 19 +--- .../BBConfigurationInitializeOperation.java| 1 - .../newproject/CreateBBCProjectOperation.java | 4 +- .../yocto/bc/ui/wizards/variable/VariablePage.java | 13 ++- .../bc/ui/wizards/variable/VariableWizard.java | 8 +- plugins/org.yocto.cmake.managedbuilder/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +- .../META-INF/MANIFEST.MF | 5 +- plugins/org.yocto.doc.user/.classpath | 2 +- plugins/org.yocto.doc.user/META-INF/MANIFEST.MF| 2 +- plugins/org.yocto.remote.utils/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +- .../org.yocto.remote.utils/META-INF/MANIFEST.MF| 2 +- .../org/yocto/remote/utils/OutputProcessor.java| 2 + .../src/org/yocto/remote/utils/RemoteHelper.java | 31 ++--- .../src/org/yocto/remote/utils/RemoteMachine.java | 9 +- .../org/yocto/remote/utils/TerminalHandler.java| 1 + plugins/org.yocto.sdk.ide.doc.user/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +- .../META-INF/MANIFEST.MF | 2 +- plugins/org.yocto.sdk.ide/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +- plugins/org.yocto.sdk.ide/META-INF/MANIFEST.MF | 3 +- plugins/org.yocto.sdk.ide/build.properties | 3 +- .../src/org/yocto/sdk/ide/YoctoSDKChecker.java | 1 - .../yocto/sdk/ide/actions/InvokeSyncAction.java| 110 -- .../yocto/sdk/ide/actions/ReconfigYoctoAction.java | 44 --- .../sdk/ide/actions/ReconfigYoctoHandler.java | 71 .../natures/YoctoSDKAutotoolsProjectNature.java| 1 + .../src/org/yocto/sdk/ide/utils/YoctoSDKUtils.java | 5 - plugins/org.yocto.sdk.remotetools/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +- .../org.yocto.sdk.remotetools/META-INF/MANIFEST.MF | 2 +- plugins/org.yocto.sdk.remotetools/build.properties | 3 +- .../org/yocto/sdk/r
[yocto] [eclipse-poky][PATCH 1/8] Update to Neon (4.6.0) release
[YOCTO #9907]
Signed-off-by: Tim Orling
---
scripts/build.sh | 2 +-
scripts/setup.sh | 36 +++-
2 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/scripts/build.sh b/scripts/build.sh
index cc696e7..4cbb273 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-#setup Yocto Eclipse plug-in build environment for Mars
+#setup Yocto Eclipse plug-in build environment for Neon
#comment out the following line if you wish to use your own http proxy settings
#export http_proxy=http://proxy.yourproxyinfo.com:8080
diff --git a/scripts/setup.sh b/scripts/setup.sh
index 233309f..30f4463 100755
--- a/scripts/setup.sh
+++ b/scripts/setup.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-#setup Yocto Eclipse plug-in build environment for Mars
+#setup Yocto Eclipse plug-in build environment for Neon
#comment out the following line if you wish to use your own http proxy settings
#export http_proxy=http://proxy.yourproxyinfo.com:8080
@@ -69,12 +69,12 @@ fi
# prepare the base Eclipse installation in folder "eclipse"
ep_rel="R-"
-ep_ver="4.5.2"
-ep_date="-201602121500"
+ep_ver="4.6"
+ep_date="-201606061100"
P2_disabled=false
P2_no_dropins=false
-if [ ! -f eclipse/plugins/org.eclipse.swt_3.104.2.v20160212-1350.jar ]; then
+if [ ! -f eclipse/plugins/org.eclipse.swt_3.105.0.v20160603-0902.jar ]; then
pushd .
@@ -222,38 +222,40 @@ update_feature_remote()
#Main Site
if [[ "$1" = "--upstream" ]]
then
-MAIN_SITE="http://download.eclipse.org/releases/mars";
-DEPRECATED_SITE="http://download.eclipse.org/releases/luna";
+MAIN_SITE="http://download.eclipse.org/releases/neon";
+DEPRECATED_SITE="http://download.eclipse.org/releases/mars";
TM_SITE="http://download.eclipse.org/tm/updates/4.0/GA";
+TM_TERMINAL_SITE="http://download.eclipse.org/tm/terminal/marketplace";
else
MAIN_SITE="http://downloads.yoctoproject.org/eclipse/mars/";
-TM_SITE="http://downloads.yoctoproject.org/eclipse/tm/updates/4.0/";
DEPRECATED_SITE="http://downloads.yoctoproject.org/eclipse/luna/ftp.osuosl.org/pub/eclipse/releases/luna";
+TM_SITE="http://downloads.yoctoproject.org/eclipse/tm/updates/4.0/";
+
TM_TERMINAL_SITE="http://downloads.yoctoproject.org/eclipse/tm/terminal/marketplace";
fi
#Update Site - always use updates from upstream
-UPDATE_SITE="http://download.eclipse.org/eclipse/updates/4.5";
+UPDATE_SITE="http://download.eclipse.org/eclipse/updates/4.6";
#CDT related
echo -e "\nPlease wait. Installing CDT.SDK.FEATURE.GROUP"
-CDTFEAT="8.8.1"
+CDTFEAT="9.0.0"
update_feature_remote ${MAIN_SITE} org.eclipse.cdt.sdk.feature.group ${CDTFEAT}
echo -e "\nPlease wait. Installing CDT.LAUNCH.REMOTE.FEATURE.GROUP"
-CDTREMOTEVER="8.8.1"
+CDTREMOTEVER="9.0.0"
update_feature_remote ${MAIN_SITE} org.eclipse.cdt.launch.remote.feature.group
${CDTREMOTEVER}
#TM Terminal (was RSE) related
echo -e "\nPlease wait. Installing TM.TERMINAL.FEATURE.FEATURE.GROUP"
-TMTERMVER="4.0.0"
-update_feature_remote ${MAIN_SITE}
org.eclipse.tm.terminal.feature.feature.group ${TMTERMVER}
+TMTERMVER="4.1.0"
+update_feature_remote ${TM_TERMINAL_SITE}
org.eclipse.tm.terminal.feature.feature.group ${TMTERMVER}
echo -e "\nPlease wait. Installing TM.TERMINAL.VIEW.RSE.FEATURE.GROUP"
-TMTERMVIEWRSEVER="4.0.0"
-update_feature_remote ${MAIN_SITE}
org.eclipse.tm.terminal.view.rse.feature.feature.group ${TMTERMVIEWRSEVER}
+TMTERMVIEWRSEVER="4.1.0"
+update_feature_remote ${TM_TERMINAL_SITE}
org.eclipse.tm.terminal.view.rse.feature.feature.group ${TMTERMVIEWRSEVER}
echo -e "\nPlease wait. Installing TM.TERMINAL.CONTROL.FEATURE.GROUP"
-TMCONTROLVER="4.0.0"
+TMCONTROLVER="4.1.0"
update_feature_remote ${MAIN_SITE}
org.eclipse.tm.terminal.control.feature.feature.group ${TMCONTROLVER}
#RSE_SDK
@@ -268,10 +270,10 @@ update_feature_remote ${TM_SITE}
org.eclipse.rse.terminals.feature.group ${RSETE
#AUTOTOOLS
echo -e "\nPlease wait. Installing AUTOTOOLS.FEATURE.GROUP"
-ATVER="8.8.1"
+ATVER="9.0.0"
update_feature_remote ${MAIN_SITE} org.eclipse.cdt.autotools.feature.group
${ATVER}
-#Lttng2
+#Lttng2
TMF_CTF_REL="1.0.0"
echo -e "\nPlease wait. Installing TRACECOMPASS.LTTNG2.UST.FEATURE.GROUP"
update_feature_remote ${MAIN_SITE}
org.eclipse.tracecompass.lttng2.ust.feature.group ${TMF_CTF_REL}
--
2.7.4
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [eclipse-poky][PATCH 2/8] fix the build
- scripts/build.sh: explicitly build org.yocto.utils
- also drop org.eclipse.cdt.debug.mi (upstream change)
Signed-off-by: Tim Orling
---
plugins/org.yocto.bc.ui/META-INF/MANIFEST.MF | 2 +-
plugins/org.yocto.sdk.ide/META-INF/MANIFEST.MF | 1 -
.../src/org/yocto/sdk/ide/utils/YoctoSDKUtils.java | 5 -
scripts/build.sh | 7 ++-
4 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/plugins/org.yocto.bc.ui/META-INF/MANIFEST.MF
b/plugins/org.yocto.bc.ui/META-INF/MANIFEST.MF
index 4922f30..213d80f 100644
--- a/plugins/org.yocto.bc.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.yocto.bc.ui/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.ui.ide,
org.eclipse.ui.console,
org.eclipse.core.filesystem,
- org.yocto.remote.utils;bundle-version="1.0.0"
+ org.yocto.remote.utils
Eclipse-LazyStart: true
Bundle-ClassPath: .
Import-Package: org.eclipse.rse.core.model,
diff --git a/plugins/org.yocto.sdk.ide/META-INF/MANIFEST.MF
b/plugins/org.yocto.sdk.ide/META-INF/MANIFEST.MF
index b0972ba..92741e0 100644
--- a/plugins/org.yocto.sdk.ide/META-INF/MANIFEST.MF
+++ b/plugins/org.yocto.sdk.ide/META-INF/MANIFEST.MF
@@ -14,7 +14,6 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.rse.ui;bundle-version="3.3.100",
org.eclipse.rse.subsystems.files.core;bundle-version="3.3.1",
org.eclipse.cdt.launch.remote;bundle-version="2.4.0",
- org.eclipse.cdt.debug.mi.core;bundle-version="7.3.0",
org.eclipse.cdt.debug.core;bundle-version="7.3.0",
org.eclipse.cdt.debug.ui;bundle-version="7.3.0",
org.eclipse.ui.ide;bundle-version="3.9.0",
diff --git
a/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/utils/YoctoSDKUtils.java
b/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/utils/YoctoSDKUtils.java
index d49281e..d4ee8ab 100644
--- a/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/utils/YoctoSDKUtils.java
+++ b/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/utils/YoctoSDKUtils.java
@@ -38,7 +38,6 @@ import org.eclipse.cdt.core.model.CoreModel;
import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
import org.eclipse.cdt.core.settings.model.ICProjectDescription;
import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
-import org.eclipse.cdt.debug.mi.core.IMILaunchConfigurationConstants;
import org.eclipse.cdt.dsf.gdb.IGDBLaunchConfigurationConstants;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
@@ -337,14 +336,10 @@ public class YoctoSDKUtils {
ILaunchConfigurationWorkingCopy w_copy =
configType.newInstance(project, configName);
Set modes=new HashSet();
modes.add("debug");
-
w_copy.setAttribute(IMILaunchConfigurationConstants.ATTR_GDB_INIT,
sDebugInitFile); // CDI
w_copy.setAttribute(IGDBLaunchConfigurationConstants.ATTR_GDB_INIT,
sDebugInitFile); // DSF
-
w_copy.setAttribute(IMILaunchConfigurationConstants.ATTR_DEBUGGER_AUTO_SOLIB,
false); // CDI
w_copy.setAttribute(IGDBLaunchConfigurationConstants.ATTR_DEBUGGER_AUTO_SOLIB,
false); // DSF
-
w_copy.setAttribute(IMILaunchConfigurationConstants.ATTR_DEBUG_NAME,
strDebugger); // CDI
w_copy.setAttribute(IGDBLaunchConfigurationConstants.ATTR_DEBUG_NAME,
strDebugger); // DSF
-
w_copy.setAttribute(IMILaunchConfigurationConstants.ATTR_DEBUGGER_PROTOCOL,
"mi"); // CDI
w_copy.setAttribute(ICDTLaunchConfigurationConstants.ATTR_PROJECT_NAME,
projectName);
if
(!project.hasNature(YoctoSDKEmptyProjectNature.YoctoSDK_EMPTY_NATURE_ID)) {
diff --git a/scripts/build.sh b/scripts/build.sh
index 4cbb273..c8969b8 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -132,14 +132,17 @@ cd ${TOP}
echo -e "\nGenerate Yocto documentation\n"
${GIT_DIR}/scripts/generate-doc.sh ${DOC_REF} ${GIT_DIR} || fail $? "generate
documentation"
-#build
+#build
+java -jar ${LAUNCHER} -application org.eclipse.ant.core.antRunner -buildfile
${BUILDFILE} -DbaseLocation=${ECLIPSE_BASE}
-Dbuilder=${GIT_DIR}/features/org.yocto.utils.headless.build
-DbuildDirectory=${BUILD_DIR} -DotherSrcDirectory=${GIT_DIR}
-DbuildId=${RELEASE} || fail $? "normal build"
java -jar ${LAUNCHER} -application org.eclipse.ant.core.antRunner -buildfile
${BUILDFILE} -DbaseLocation=${ECLIPSE_BASE}
-Dbuilder=${GIT_DIR}/features/org.yocto.bc.headless.build
-DbuildDirectory=${BUILD_DIR} -DotherSrcDirectory=${GIT_DIR}
-DbuildId=${RELEASE} || fail $? "normal build"
java -jar ${LAUNCHER} -application org.eclipse.ant.core.antRunner -buildfile
${BUILDFILE} -DbaseLocation=${ECLIPSE_BASE}
-Dbuilder=${GIT_DIR}/features/org.yocto.doc.headless.build
-DbuildDirectory=${BUILD_DIR} -DotherSrcDirectory=${GIT_DIR}
-Dbui
[yocto] [eclipse-poky][PATCH 3/8] add script to update java version; update all to JavaSE-1.8
[YOCTO #9562] Minimum required java version for Neon is 1.8 Signed-off-by: Tim Orling --- .../org.yocto.bc.headless.build/build.properties | 4 +- .../org.yocto.doc.headless.build/build.properties | 4 +- .../org.yocto.sdk.headless.build/build.properties | 4 +- .../build.properties | 4 +- plugins/org.yocto.bc.ui/.classpath | 2 +- plugins/org.yocto.bc.ui/META-INF/MANIFEST.MF | 2 +- plugins/org.yocto.cmake.managedbuilder/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +- .../META-INF/MANIFEST.MF | 5 +- plugins/org.yocto.doc.user/.classpath | 2 +- plugins/org.yocto.doc.user/META-INF/MANIFEST.MF| 2 +- plugins/org.yocto.remote.utils/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +- .../org.yocto.remote.utils/META-INF/MANIFEST.MF| 2 +- plugins/org.yocto.sdk.ide.doc.user/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +- .../META-INF/MANIFEST.MF | 2 +- plugins/org.yocto.sdk.ide/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +- plugins/org.yocto.sdk.ide/META-INF/MANIFEST.MF | 2 +- plugins/org.yocto.sdk.ide/build.properties | 3 +- plugins/org.yocto.sdk.remotetools/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +- .../org.yocto.sdk.remotetools/META-INF/MANIFEST.MF | 2 +- plugins/org.yocto.sdk.remotetools/build.properties | 3 +- scripts/change-java-version.sh | 94 ++ 26 files changed, 137 insertions(+), 40 deletions(-) create mode 100755 scripts/change-java-version.sh diff --git a/features/org.yocto.bc.headless.build/build.properties b/features/org.yocto.bc.headless.build/build.properties index 7c27054..20995d4 100644 --- a/features/org.yocto.bc.headless.build/build.properties +++ b/features/org.yocto.bc.headless.build/build.properties @@ -247,10 +247,10 @@ javacVerbose=true #compilerArg= # Default value for the version of the source code. This value is used when compiling plug-ins that do not set the Bundle-RequiredExecutionEnvironment or set javacSource in build.properties -javacSource=1.7 +javacSource=1.8 # Default value for the version of the byte code targeted. This value is used when compiling plug-ins that do not set the Bundle-RequiredExecutionEnvironment or set javacTarget in build.properties. -javacTarget=1.7 +javacTarget=1.8 #individualSourceBundles=true diff --git a/features/org.yocto.doc.headless.build/build.properties b/features/org.yocto.doc.headless.build/build.properties index 8ffd039..99d8322 100644 --- a/features/org.yocto.doc.headless.build/build.properties +++ b/features/org.yocto.doc.headless.build/build.properties @@ -247,10 +247,10 @@ javacVerbose=true #compilerArg= # Default value for the version of the source code. This value is used when compiling plug-ins that do not set the Bundle-RequiredExecutionEnvironment or set javacSource in build.properties -javacSource=1.7 +javacSource=1.8 # Default value for the version of the byte code targeted. This value is used when compiling plug-ins that do not set the Bundle-RequiredExecutionEnvironment or set javacTarget in build.properties. -javacTarget=1.7 +javacTarget=1.8 #individualSourceBundles=true diff --git a/features/org.yocto.sdk.headless.build/build.properties b/features/org.yocto.sdk.headless.build/build.properties index 1e8e6ca..4b64f41 100644 --- a/features/org.yocto.sdk.headless.build/build.properties +++ b/features/org.yocto.sdk.headless.build/build.properties @@ -247,10 +247,10 @@ javacVerbose=true #compilerArg= # Default value for the version of the source code. This value is used when compiling plug-ins that do not set the Bundle-RequiredExecutionEnvironment or set javacSource in build.properties -javacSource=1.7 +javacSource=1.8 # Default value for the version of the byte code targeted. This value is used when compiling plug-ins that do not set the Bundle-RequiredExecutionEnvironment or set javacTarget in build.properties. -javacTarget=1.7 +javacTarget=1.8 #individualSourceBundles=true diff --git a/features/org.yocto.utils.headless.build/build.properties b/features/org.yocto.utils.headless.build/build.properties index 9c3e516..f9bc94b 100644 --- a/features/org.yocto.utils.headless.build/build.properties +++ b/features/org.yocto.utils.headless.build/build.properties @@ -247,10 +247,10 @@ javacVerbose=true #compilerArg= # Default value for the version of the source code. This value is used when compiling plug-ins that do not set the Bundle-RequiredExecutionEnvironment or set javacSource in build.properties -javacSource=1.7 +javacSource=1.8 # Default value for the version of the byte code targeted. This value is used when compiling plug-ins that do not set the Bundle-RequiredExecutionEn
[yocto] [eclipse-poky][PATCH 4/8] org.yocto.sdk/feature.xml: clean up unused dependencies
[YOCTO #9908] Signed-off-by: Tim Orling --- features/org.yocto.sdk/feature.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/features/org.yocto.sdk/feature.xml b/features/org.yocto.sdk/feature.xml index 9ab19af..f0f4e38 100644 --- a/features/org.yocto.sdk/feature.xml +++ b/features/org.yocto.sdk/feature.xml @@ -67,9 +67,6 @@ - - - https://lists.yoctoproject.org/listinfo/yocto
[yocto] [eclipse-poky][PATCH 6/8] org.yocto.remote.utils: fix or supress warnings
[YOCTO #9908]
Replace SubProgressMonitor usage with SubMonitor
Signed-off-by: Tim Orling
---
.../org/yocto/remote/utils/OutputProcessor.java| 2 ++
.../src/org/yocto/remote/utils/RemoteHelper.java | 31 +++---
.../src/org/yocto/remote/utils/RemoteMachine.java | 9 +++
.../org/yocto/remote/utils/TerminalHandler.java| 1 +
4 files changed, 23 insertions(+), 20 deletions(-)
diff --git
a/plugins/org.yocto.remote.utils/src/org/yocto/remote/utils/OutputProcessor.java
b/plugins/org.yocto.remote.utils/src/org/yocto/remote/utils/OutputProcessor.java
index 401a782..45df3b1 100644
---
a/plugins/org.yocto.remote.utils/src/org/yocto/remote/utils/OutputProcessor.java
+++
b/plugins/org.yocto.remote.utils/src/org/yocto/remote/utils/OutputProcessor.java
@@ -21,6 +21,7 @@ import
org.eclipse.rse.internal.services.shells.TerminalServiceHostShell;
import org.eclipse.rse.services.shells.HostShellProcessAdapter;
import org.eclipse.rse.services.shells.IHostShell;
+@SuppressWarnings("restriction")
public abstract class OutputProcessor{
private static final int ERROR_BUFFER = 1;
private static final int OUTPUT_BUFFER = 2;
@@ -37,6 +38,7 @@ public abstract class OutputProcessor{
this.cmdHandler = cmdHandler;
this.task = task;
}
+
public ProcessStreamBuffer processOutput() throws Exception{
if (hostShell == null)
throw new Exception("An error has occured while trying
to run remote command!");
diff --git
a/plugins/org.yocto.remote.utils/src/org/yocto/remote/utils/RemoteHelper.java
b/plugins/org.yocto.remote.utils/src/org/yocto/remote/utils/RemoteHelper.java
index 285b7cf..0532341 100644
---
a/plugins/org.yocto.remote.utils/src/org/yocto/remote/utils/RemoteHelper.java
+++
b/plugins/org.yocto.remote.utils/src/org/yocto/remote/utils/RemoteHelper.java
@@ -43,7 +43,7 @@ import org.eclipse.core.runtime.MultiStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.core.runtime.SubMonitor;
import org.eclipse.osgi.util.NLS;
import org.eclipse.rse.core.IRSECoreRegistry;
import org.eclipse.rse.core.IRSECoreStatusCodes;
@@ -76,6 +76,7 @@ import
org.eclipse.rse.subsystems.terminals.core.ITerminalServiceSubSystem;
import org.eclipse.rse.ui.RSEUIPlugin;
import org.eclipse.ui.console.MessageConsole;
+@SuppressWarnings("restriction")
public class RemoteHelper {
private final static String EXIT_CMD = "exit"; //$NON-NLS-1$
private final static String CMD_DELIMITER = ";"; //$NON-NLS-1$
@@ -235,7 +236,7 @@ public class RemoteHelper {
try {
fileService = getConnectedRemoteFileService(
connection,
- new
SubProgressMonitor(monitor, 5));
+
SubMonitor.convert(monitor, 5));
InputStream inputStream = FileLocator.openStream(
Activator.getDefault().getBundle(), new
Path(locaPathInPlugin), false);
Path remotePath = new Path(remoteExePath);
@@ -255,12 +256,12 @@ public class RemoteHelper {
bos.close();
fileService.upload(tempFile,
remotePath.removeLastSegments(1)
.toString(), remotePath.lastSegment(),
true, null, null,
- new SubProgressMonitor(monitor, 80));
+ SubMonitor.convert(monitor, 80));
// Need to change the permissions to match the original
file
// permissions because of a bug in upload
remoteShellExec(
connection,
- "", "chmod", "+x " +
spaceEscapify(remotePath.toString()), new SubProgressMonitor(monitor, 5));
//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "", "chmod", "+x " +
spaceEscapify(remotePath.toString()), SubMonitor.convert(monitor, 5));
//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
} finally {
monitor.done();
@@ -278,18 +279,18 @@ public class RemoteHelper {
try {
fileService = getConnectedRemoteFileService(
connection,
- new
SubProgressMonitor(monitor, 10));
+
SubMonitor.convert(monitor, 10));
File file = new File(localExePath);
monitor.worked(5);
Path remotePath =
[yocto] [eclipse-poky][PATCH 7/8] org.yocto.sdk.ide: remove InvokeAction usage
[YOCTO #9908]
Dropped from CDT 9.0.0 (that work is done by handlers now)
Suppress restriction warnings
Cleanup unused imports
Signed-off-by: Tim Orling
---
.../src/org/yocto/sdk/ide/YoctoSDKChecker.java | 1 -
.../yocto/sdk/ide/actions/InvokeSyncAction.java| 110 -
.../yocto/sdk/ide/actions/ReconfigYoctoAction.java | 44 -
.../sdk/ide/actions/ReconfigYoctoHandler.java | 71 -
.../natures/YoctoSDKAutotoolsProjectNature.java| 1 +
5 files changed, 21 insertions(+), 206 deletions(-)
delete mode 100644
plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/actions/InvokeSyncAction.java
delete mode 100644
plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/actions/ReconfigYoctoAction.java
diff --git
a/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/YoctoSDKChecker.java
b/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/YoctoSDKChecker.java
index 8e48852..d1d74f2 100644
--- a/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/YoctoSDKChecker.java
+++ b/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/YoctoSDKChecker.java
@@ -22,7 +22,6 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import org.eclipse.jface.preference.IPreferenceStore;
-import org.yocto.sdk.ide.natures.YoctoSDKProjectNature;
import org.yocto.sdk.ide.utils.YoctoSDKUtils;
import org.yocto.sdk.ide.utils.YoctoSDKUtilsConstants;
diff --git
a/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/actions/InvokeSyncAction.java
b/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/actions/InvokeSyncAction.java
deleted file mode 100644
index f39d5fd..000
---
a/plugins/org.yocto.sdk.ide/src/org/yocto/sdk/ide/actions/InvokeSyncAction.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/***
- * Copyright (c) 2010 Intel Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Intel - initial API and implementation
-
***/
-package org.yocto.sdk.ide.actions;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.ArrayList;
-
-import org.eclipse.cdt.core.CommandLauncher;
-import org.eclipse.cdt.core.ConsoleOutputStream;
-import org.eclipse.cdt.core.envvar.IEnvironmentVariable;
-import org.eclipse.cdt.core.resources.IConsole;
-import org.eclipse.cdt.managedbuilder.core.IConfiguration;
-import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
-import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.cdt.internal.autotools.core.AutotoolsNewMakeGenerator;
-import org.eclipse.cdt.internal.autotools.ui.actions.InvokeAction;
-import org.eclipse.cdt.internal.autotools.ui.actions.InvokeMessages;
-
-import org.yocto.sdk.ide.YoctoSDKPlugin;
-
-@SuppressWarnings("restriction")
-public class InvokeSyncAction extends InvokeAction {
- protected void executeLocalConsoleCommand(final IConsole console, final
String actionName, final String command,
- final String[] argumentList, final IPath execDir, final
String password) throws CoreException, IOException {
-
- String errMsg = null;
- IProject project = getSelectedContainer().getProject();
- // Get a build console for the project
- ConsoleOutputStream consoleOutStream =
console.getOutputStream();
- // FIXME: we want to remove need for ManagedBuilderManager, but
how do we
- // get environment variables.
- IManagedBuildInfo info =
ManagedBuildManager.getBuildInfo(project);
- IConfiguration cfg = info.getDefaultConfiguration();
-
- StringBuffer buf = new StringBuffer();
- String[] consoleHeader = new String[3];
-
- consoleHeader[0] = actionName;
- consoleHeader[1] = cfg.getName();
- consoleHeader[2] = project.getName();
- buf.append(System.getProperty("line.separator", "\n"));
//$NON-NLS-1$ //$NON-NLS-2$
- String invokeMsg =
InvokeMessages.getFormattedString("InvokeAction.console.message", //$NON-NLS-1$
- new String[]{actionName, execDir.toString()});
//$NON-NLS-1$
- buf.append(invokeMsg);
- buf.append(System.getProperty("line.separator", "\n"));
//$NON-NLS-1$ //$NON-NLS-2$
- buf.append(System.getProperty("line.separator", "\n"));
//$NON-NLS-1$ //$NON-NLS-2$
- conso
[yocto] [eclipse-poky][PATCH 5/8] org.yocto.bc.ui: cleanup unused imports; fix generics warnings
[YOCTO #9908]
Also add any required unimplemented methods
Fix deprecated Eclipse-LazyStart: true in META-INF/MANIFEST
Signed-off-by: Tim Orling
---
plugins/org.yocto.bc.ui/META-INF/MANIFEST.MF | 2 +-
.../src/org/yocto/bc/bitbake/BBRecipe.java | 12 +-
.../src/org/yocto/bc/bitbake/BBSession.java| 126 +++--
.../org/yocto/bc/bitbake/ProjectInfoHelper.java| 3 -
.../src/org/yocto/bc/ui/Activator.java | 37 +++---
.../ui/actions/AbstractBitbakeCommandAction.java | 5 +-
.../yocto/bc/ui/actions/LaunchToasterDialog.java | 17 +--
.../bc/ui/actions/LaunchVariableWizardAction.java | 3 +-
.../org/yocto/bc/ui/builder/BitbakeBuilder.java| 6 +-
.../yocto/bc/ui/builder/ToggleNatureAction.java| 5 +-
.../src/org/yocto/bc/ui/decorators/ReadOnly.java | 9 +-
.../bc/ui/editors/bitbake/BBVariableTextHover.java | 2 +-
.../yocto/bc/ui/filesystem/CustomLocalFile.java| 1 +
.../src/org/yocto/bc/ui/filesystem/OEFile.java | 4 +-
.../org/yocto/bc/ui/filesystem/OEFileSystem.java | 6 +-
.../org/yocto/bc/ui/filesystem/OEIgnoreFile.java | 11 +-
.../src/org/yocto/bc/ui/filesystem/Policy.java | 4 +-
.../perspectives/BitbakeCommanderPerspective.java | 13 +--
.../org/yocto/bc/ui/popup/actions/NewAction.java | 1 -
.../yocto/bc/ui/views/RecipeContentProvider.java | 7 +-
.../src/org/yocto/bc/ui/views/RecipeView.java | 2 -
.../bc/ui/wizards/BitbakeRecipeUIElement.java | 6 +-
.../org/yocto/bc/ui/wizards/FiniteStateWizard.java | 10 +-
.../yocto/bc/ui/wizards/FiniteStateWizardPage.java | 26 ++---
.../bc/ui/wizards/NewBitBakeFileRecipeWizard.java | 5 +-
.../ui/wizards/NewBitBakeFileRecipeWizardPage.java | 13 +--
.../ui/wizards/importProject/BBCProjectPage.java | 2 +-
.../importProject/ImportYoctoProjectWizard.java| 11 +-
.../yocto/bc/ui/wizards/install/InstallWizard.java | 16 +--
.../yocto/bc/ui/wizards/install/OptionsPage.java | 19 +---
.../BBConfigurationInitializeOperation.java| 1 -
.../newproject/CreateBBCProjectOperation.java | 4 +-
.../yocto/bc/ui/wizards/variable/VariablePage.java | 13 ++-
.../bc/ui/wizards/variable/VariableWizard.java | 8 +-
34 files changed, 187 insertions(+), 223 deletions(-)
diff --git a/plugins/org.yocto.bc.ui/META-INF/MANIFEST.MF
b/plugins/org.yocto.bc.ui/META-INF/MANIFEST.MF
index 7b725ca..ebe0173 100644
--- a/plugins/org.yocto.bc.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.yocto.bc.ui/META-INF/MANIFEST.MF
@@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.ui.console,
org.eclipse.core.filesystem,
org.yocto.remote.utils
-Eclipse-LazyStart: true
+Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
Import-Package: org.eclipse.rse.core.model,
org.eclipse.rse.services.clientserver.messages,
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/bitbake/BBRecipe.java
b/plugins/org.yocto.bc.ui/src/org/yocto/bc/bitbake/BBRecipe.java
index 2b355ba..65512fd 100644
--- a/plugins/org.yocto.bc.ui/src/org/yocto/bc/bitbake/BBRecipe.java
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/bitbake/BBRecipe.java
@@ -12,14 +12,6 @@ package org.yocto.bc.bitbake;
import java.io.IOException;
-import org.eclipse.jface.preference.JFacePreferences;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.console.ConsolePlugin;
-import org.eclipse.ui.console.IConsole;
-import org.eclipse.ui.console.MessageConsole;
-import org.eclipse.ui.console.MessageConsoleStream;
-
/**
* Represents the bitbake environment of a recipe package.
* @author kgilmer
@@ -47,4 +39,8 @@ public class BBRecipe extends BBSession {
protected String getDefaultDepends() {
return this.filePath;
}
+
+ public BBSession getSession() {
+ return session;
+ }
}
diff --git a/plugins/org.yocto.bc.ui/src/org/yocto/bc/bitbake/BBSession.java
b/plugins/org.yocto.bc.ui/src/org/yocto/bc/bitbake/BBSession.java
index b13a6c3..02a0a51 100644
--- a/plugins/org.yocto.bc.ui/src/org/yocto/bc/bitbake/BBSession.java
+++ b/plugins/org.yocto.bc.ui/src/org/yocto/bc/bitbake/BBSession.java
@@ -15,7 +15,6 @@ import java.io.File;
import java.io.FileFilter;
import java.io.IOException;
import java.io.StringReader;
-import java.net.URI;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -31,12 +30,12 @@ import java.util.concurrent.locks.Lock;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.jface.preference.JFacePreferences;
import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.console.C
[yocto] [eclipse-poky][PATCH 8/8] org.yocto.sdk.remotetools: SubProgressMonitor -> SubMonitor
[YOCTO #9908]
Suppress restriction, unchecked and unused warnings.
Cleanup unused imports/variables.
Comment out some imports that were only used in commented out code.
Signed-off-by: Tim Orling
---
.../src/org/yocto/sdk/remotetools/YoctoJSONHelper.java | 6 ++
.../src/org/yocto/sdk/remotetools/actions/BaseModel.java | 12 ++--
.../org/yocto/sdk/remotetools/actions/OprofileModel.java | 6 +++---
.../org/yocto/sdk/remotetools/actions/PowertopModel.java | 6 +++---
.../yocto/sdk/remotetools/actions/SystemtapHandler.java | 2 ++
.../sdk/remotetools/actions/SystemtapSettingDialog.java | 1 +
.../src/org/yocto/sdk/remotetools/actions/Ust2Model.java | 16
.../org/yocto/sdk/remotetools/views/BaseFileView.java| 1 +
.../org/yocto/sdk/remotetools/views/TerminalViewTab.java | 6 --
.../org/yocto/sdk/remotetools/views/TerminalViewer.java | 3 ++-
.../sdk/remotetools/wizards/bsp/PropertiesPage.java | 1 +
11 files changed, 37 insertions(+), 23 deletions(-)
diff --git
a/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/YoctoJSONHelper.java
b/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/YoctoJSONHelper.java
index 37ce54d..36723d9 100644
---
a/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/YoctoJSONHelper.java
+++
b/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/YoctoJSONHelper.java
@@ -32,6 +32,7 @@ public class YoctoJSONHelper {
try {
JSONObject obj = (JSONObject)JSONValue.parse(new
FileReader(PROPERTIES_FILE));
+ @SuppressWarnings("unchecked")
Set keys = obj.keySet();
if (!keys.isEmpty()) {
Iterator iter = keys.iterator();
@@ -57,8 +58,13 @@ public class YoctoJSONHelper {
return properties;
}
+ @SuppressWarnings("unchecked")
public static void createBspJSONFile(HashSet
properties) {
try {
+ /* should be JSONObject obj = new
JSONObject();
+* but upstream json-simple would have to change.
+* See
http://stackoverflow.com/questions/16415436/json-and-generics-in-java-type-safety-warning
+*/
JSONObject obj = new JSONObject();
if (!properties.isEmpty()) {
Iterator it =
properties.iterator();
diff --git
a/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/BaseModel.java
b/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/BaseModel.java
index 6686d39..d6004aa 100644
---
a/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/BaseModel.java
+++
b/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/BaseModel.java
@@ -15,7 +15,7 @@ import java.io.InputStream;
import java.lang.reflect.InvocationTargetException;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
+import org.eclipse.core.runtime.SubMonitor;
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.rse.core.model.IHost;
import org.yocto.remote.utils.RemoteHelper;
@@ -84,23 +84,23 @@ abstract public class BaseModel implements
IRunnableWithProgress {
monitor.beginTask(RUN_MSG + taskName, WORKLOAD);
monitor.subTask(INIT_MSG + taskName + DOTS);
- init(new SubProgressMonitor(monitor, INIT_PERCENT));
+ init(SubMonitor.convert(monitor, INIT_PERCENT));
monitor.subTask(PRE_PROCESS_MSG + taskName + DOTS);
- preProcess(new SubProgressMonitor(monitor,
PRE_PROCESS_PERCENT));
+ preProcess(SubMonitor.convert(monitor,
PRE_PROCESS_PERCENT));
monitor.subTask(PROCESS_MSG + taskName + DOTS);
- process(new SubProgressMonitor(monitor,
PROCESS_PERCENT));
+ process(SubMonitor.convert(monitor, PROCESS_PERCENT));
monitor.subTask(POST_PROCESS_MSG + taskName + DOTS);
- postProcess(new SubProgressMonitor(monitor,
POST_PROCESS_PERCENT));
+ postProcess(SubMonitor.convert(monitor,
POST_PROCESS_PERCENT));
} catch (InterruptedException e){
throw new InterruptedException("User cancelled!");
} catch (InvocationTargetException e) {
throw e;
} finally {
monitor.subTask(CLEAN_MSG + taskName + DOTS);
- clean(new SubProgressMonitor(monitor, CLEAN_PERCENT));
+ clean(SubMonitor.convert(monitor, CLEAN_PERCENT));
monitor.done();
[yocto] [meta-raspberrypi][PATCH 01/23] linux-raspberrypi_4.4.bb: support for .dtbo files for dtb overlays
From: Herve Jourdain
Kernel 4.4.6+ on RaspberryPi support .dtbo files for overlays, instead of .dtb.
Patch the kernel, which has faulty rules to generate .dtbo the way yocto does
Signed-off-by: Herve Jourdain
Signed-off-by: Khem Raj
---
.../0001-fix-dtbo-rules.patch | 44 ++
recipes-kernel/linux/linux-raspberrypi_4.4.bb | 1 +
2 files changed, 45 insertions(+)
create mode 100644
recipes-kernel/linux/linux-raspberrypi-4.4/0001-fix-dtbo-rules.patch
diff --git
a/recipes-kernel/linux/linux-raspberrypi-4.4/0001-fix-dtbo-rules.patch
b/recipes-kernel/linux/linux-raspberrypi-4.4/0001-fix-dtbo-rules.patch
new file mode 100644
index 000..5113e23
--- /dev/null
+++ b/recipes-kernel/linux/linux-raspberrypi-4.4/0001-fix-dtbo-rules.patch
@@ -0,0 +1,44 @@
+From 13c8784da3dbd977f64cec740eba775b6fab11c2 Mon Sep 17 00:00:00 2001
+From: Herve Jourdain
+Date: Fri, 20 May 2016 16:02:23 +0800
+Subject: [yocto][meta-raspberrypi][PATCH v4 4/5] linux-raspberrypi_4.4.inc:
+ support for .dtbo files for dtb overlays
+
+Upstream-Status: Pending
+
+Kernel 4.4.6+ on RaspberryPi support .dtbo files for overlays, instead of .dtb.
+Patch the kernel, which has faulty rules to generate .dtbo the way yocto does
+
+Signed-off-by: Herve Jourdain
+---
+ .../0001-fix-dtbo-rules.patch | 27 ++
+ 1 file changed, 27 insertions(+)
+ create mode 100644
recipes-kernel/linux/linux-raspberrypi-4.4/0001-fix-dtbo-rules.patch
+
+diff --git a/arch/arm/Makefile b/arch/arm/Makefile
+index a2e7cf7..673c1cb 100644
+--- a/arch/arm/Makefile
b/arch/arm/Makefile
+@@ -333,6 +333,8 @@ $(INSTALL_TARGETS):
+
+ %.dtb: | scripts
+ $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@
++%.dtbo: | scripts
++ $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@
+
+ PHONY += dtbs dtbs_install
+
+diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
+index 3079c4f..6cc3766 100644
+--- a/scripts/Makefile.lib
b/scripts/Makefile.lib
+@@ -293,7 +293,8 @@ $(obj)/%.dtb: $(src)/%.dts FORCE
+ $(call if_changed_dep,dtc)
+
+ quiet_cmd_dtco = DTCO$@
+-cmd_dtco = $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \
++cmd_dtco = mkdir -p $(dir ${dtc-tmp}) ; \
++ $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \
+ $(objtree)/scripts/dtc/dtc -@ -H epapr -O dtb -o $@ -b 0 \
+ -i $(dir $<) $(DTC_FLAGS) \
+ -d $(depfile).dtc.tmp $(dtc-tmp) ; \
diff --git a/recipes-kernel/linux/linux-raspberrypi_4.4.bb
b/recipes-kernel/linux/linux-raspberrypi_4.4.bb
index 3291ffd..b13925c 100644
--- a/recipes-kernel/linux/linux-raspberrypi_4.4.bb
+++ b/recipes-kernel/linux/linux-raspberrypi_4.4.bb
@@ -4,5 +4,6 @@ LINUX_VERSION ?= "4.4.13"
SRCREV = "680be5e27a9593cf26079c6e5744a04cc2809d13"
SRC_URI =
"git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-4.4.y \
+ file://0001-fix-dtbo-rules.patch \
"
require linux-raspberrypi.inc
--
2.9.2
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [meta-raspberrypi][PATCH 02/23] rpi-base.inc: support for .dtbo files for dtb overlays
From: Herve Jourdain Kernel 4.4.6+ on RaspberryPi support .dtbo files for overlays, instead of .dtb. Add support for .dtbo variant of overlays for the default KERNEL_DEVICETREE variable (the list will be turned into "-overlay.dtb" by linux-raspberry-base.bbclass, if needed, depending on the kernel version) Signed-off-by: Herve Jourdain Signed-off-by: Khem Raj --- conf/machine/include/rpi-base.inc | 30 +++--- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/conf/machine/include/rpi-base.inc b/conf/machine/include/rpi-base.inc index 56ca83e..47eb23b 100644 --- a/conf/machine/include/rpi-base.inc +++ b/conf/machine/include/rpi-base.inc @@ -22,21 +22,21 @@ KERNEL_DEVICETREE ?= " \ bcm2709-rpi-2-b.dtb \ bcm2710-rpi-3-b.dtb \ \ -overlays/hifiberry-amp-overlay.dtb \ -overlays/hifiberry-dac-overlay.dtb \ -overlays/hifiberry-dacplus-overlay.dtb \ -overlays/hifiberry-digi-overlay.dtb \ -overlays/i2c-rtc-overlay.dtb \ -overlays/iqaudio-dac-overlay.dtb \ -overlays/iqaudio-dacplus-overlay.dtb \ -overlays/lirc-rpi-overlay.dtb \ -overlays/pitft22-overlay.dtb \ -overlays/pitft28-resistive-overlay.dtb \ -overlays/pps-gpio-overlay.dtb \ -overlays/rpi-ft5406-overlay.dtb \ -overlays/w1-gpio-overlay.dtb \ -overlays/w1-gpio-pullup-overlay.dtb \ -overlays/pi3-miniuart-bt-overlay.dtb \ +overlays/hifiberry-amp.dtbo \ +overlays/hifiberry-dac.dtbo \ +overlays/hifiberry-dacplus.dtbo \ +overlays/hifiberry-digi.dtbo \ +overlays/i2c-rtc.dtbo \ +overlays/iqaudio-dac.dtbo \ +overlays/iqaudio-dacplus.dtbo \ +overlays/lirc-rpi.dtbo \ +overlays/pitft22.dtbo \ +overlays/pitft28-resistive.dtbo \ +overlays/pps-gpio.dtbo \ +overlays/rpi-ft5406.dtbo \ +overlays/w1-gpio.dtbo \ +overlays/w1-gpio-pullup.dtbo \ +overlays/pi3-miniuart-bt.dtbo \ " KERNEL_IMAGETYPE ?= "Image" -- 2.9.2 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [meta-raspberrypi][PATCH 03/23] linux-raspberrypi-base.bbclass: support for .dtbo files for dtb overlays
From: Herve Jourdain
Kernel 4.4.6+ on RaspberryPi support .dtbo files for overlays, instead of .dtb.
Add support for both variants of overlays ("-overlay.dtb" and ".dtbo")
Change which variant needs to be supported based on the kernel version
CAUTION: when called from IMAGE_CMD_rpi-sdimg, 'TMPDIR' is not set, causing
'STAGING_KERNEL_BUILDDIR' to not be expanded, causing get_kernelversion_file()
to fail!
To avoid this problem, get_dts() and split_overlays() MUST be called with the
kernel version parameter set, when called from IMAGE_CMD_rpi-sdimg!
Signed-off-by: Herve Jourdain
Signed-off-by: Khem Raj
---
classes/linux-raspberrypi-base.bbclass | 19 ---
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/classes/linux-raspberrypi-base.bbclass
b/classes/linux-raspberrypi-base.bbclass
index 40beef1..930fc44 100644
--- a/classes/linux-raspberrypi-base.bbclass
+++ b/classes/linux-raspberrypi-base.bbclass
@@ -1,7 +1,8 @@
inherit linux-kernel-base
-
def get_dts(d, ver):
+import re
+
staging_dir = d.getVar("STAGING_KERNEL_BUILDDIR", True)
dts = d.getVar("KERNEL_DEVICETREE", True)
@@ -20,20 +21,24 @@ def get_dts(d, ver):
# Always turn off device tree support for kernel's < 3.18
try:
-if int(min_ver[0]) <= 3:
-if int(min_ver[1]) < 18:
-dts = ""
+if int(min_ver[0]) >= 4:
+if (int(min_ver[1]) < 4) or (int(min_ver[1]) == 4 and
int(min_ver[2]) < 6):
+dts = ' '.join([(re.sub(r'(.*)\.dtbo$', r'\1-overlay.dtb', x))
for x in dts.split()])
+elif int(min_ver[1]) < 18:
+dts = ""
except IndexError:
min_ver = None
return dts
-def split_overlays(d, out):
-dts = get_dts(d, None)
+def split_overlays(d, ver, out):
+dts = get_dts(d, ver)
if out:
overlays = oe.utils.str_filter_out('\S+\-overlay\.dtb$', dts, d)
+overlays = oe.utils.str_filter_out('\S+\.dtbo$', overlays, d)
else:
-overlays = oe.utils.str_filter('\S+\-overlay\.dtb$', dts, d)
+overlays = oe.utils.str_filter('\S+\-overlay\.dtb$', dts, d) + \
+ " " + oe.utils.str_filter('\S+\.dtbo$', dts, d)
return overlays
--
2.9.2
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [meta-raspberrypi][PATCH 05/23] rpi-default-providers.inc: change default providers to support vc4graphics
From: Herve Jourdain
Signed-off-by: Herve Jourdain
Signed-off-by: Khem Raj
---
conf/machine/include/rpi-default-providers.inc | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/conf/machine/include/rpi-default-providers.inc
b/conf/machine/include/rpi-default-providers.inc
index 359870d..078e9d6 100644
--- a/conf/machine/include/rpi-default-providers.inc
+++ b/conf/machine/include/rpi-default-providers.inc
@@ -2,8 +2,8 @@
PREFERRED_PROVIDER_virtual/kernel ?= "linux-raspberrypi"
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
-PREFERRED_PROVIDER_virtual/egl ?= "userland"
-PREFERRED_PROVIDER_virtual/libgles2 ?= "userland"
-PREFERRED_PROVIDER_virtual/libgl ?= "mesa-gl"
-PREFERRED_PROVIDER_virtual/mesa ?= "mesa-gl"
+PREFERRED_PROVIDER_virtual/egl ?= "${@bb.utils.contains("MACHINE_FEATURES",
"vc4graphics", "mesa", "userland", d)}"
+PREFERRED_PROVIDER_virtual/libgles2 ?=
"${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "mesa", "userland",
d)}"
+PREFERRED_PROVIDER_virtual/libgl ?= "${@bb.utils.contains("MACHINE_FEATURES",
"vc4graphics", "mesa", "mesa-gl", d)}"
+PREFERRED_PROVIDER_virtual/mesa ?= "${@bb.utils.contains("MACHINE_FEATURES",
"vc4graphics", "mesa", "mesa-gl", d)}"
PREFERRED_PROVIDER_jpeg ?= "jpeg"
--
2.9.2
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [meta-raspberrypi][PATCH 04/23] sdcard_image-rpi.bbclass: support for .dtbo files for dtb overlays
From: Herve Jourdain
Kernel 4.4.6+ on RaspberryPi support .dtbo files for overlays, instead of .dtb.
Add support for both extensions for overlays (".dtb" and ".dtbo")
CAUTION: in IMAGE_CMD_rpi-sdimg, 'TMPDIR' is not set, causing
'STAGING_KERNEL_BUILDDIR' to not be expanded, causing get_dts() to not being
able to get the kernel version!
To avoid this problem, the kernel version is added in a new variable outside
the scope of IMAGE_CMD_rpi-sdimg, and its value passed to get_dts() and
split_overlays()!
Signed-off-by: Herve Jourdain
Signed-off-by: Khem Raj
---
classes/sdcard_image-rpi.bbclass | 15 +--
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/classes/sdcard_image-rpi.bbclass b/classes/sdcard_image-rpi.bbclass
index 57cefea..a04204a 100644
--- a/classes/sdcard_image-rpi.bbclass
+++ b/classes/sdcard_image-rpi.bbclass
@@ -75,6 +75,8 @@ IMAGEDATESTAMP = "${@time.strftime('%Y.%m.%d',time.gmtime())}"
IMAGE_CMD_rpi-sdimg[vardepsexclude] += "IMAGEDATESTAMP"
IMAGE_CMD_rpi-sdimg[vardepsexclude] += "DATETIME"
+RPI_KERNEL_VERSION :=
"${@get_kernelversion_file('${STAGING_KERNEL_BUILDDIR}')}"
+
IMAGE_CMD_rpi-sdimg () {
# Align partitions
@@ -85,7 +87,7 @@ IMAGE_CMD_rpi-sdimg () {
echo "Creating filesystem with Boot partition ${BOOT_SPACE_ALIGNED} KiB
and RootFS $ROOTFS_SIZE KiB"
# Check if we are building with device tree support
- DTS="${@get_dts(d, None)}"
+ DTS="${@get_dts(d, '${RPI_KERNEL_VERSION}')}"
# Initialize sdcard image file
dd if=/dev/zero of=${SDIMG} bs=1024 count=0 seek=${SDIMG_SIZE}
@@ -105,9 +107,9 @@ IMAGE_CMD_rpi-sdimg () {
mkfs.vfat -n "${BOOTDD_VOLUME_ID}" -S 512 -C ${WORKDIR}/boot.img
$BOOT_BLOCKS
mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/*
::/
if test -n "${DTS}"; then
- # Device Tree Overlays are assumed to be suffixed by
'-overlay.dtb' string and will be put in a dedicated folder
- DT_OVERLAYS="${@split_overlays(d, 0)}"
- DT_ROOT="${@split_overlays(d, 1)}"
+ # Device Tree Overlays are assumed to be suffixed by
'-overlay.dtb' (4.1.x) or by '.dtbo' (4.4.9+) string and will be put in a
dedicated folder
+ DT_OVERLAYS="${@split_overlays(d, '${RPI_KERNEL_VERSION}', 0)}"
+ DT_ROOT="${@split_overlays(d, '${RPI_KERNEL_VERSION}', 1)}"
# Copy board device trees to root folder
for DTB in ${DT_ROOT}; do
@@ -119,9 +121,10 @@ IMAGE_CMD_rpi-sdimg () {
# Copy device tree overlays to dedicated folder
mmd -i ${WORKDIR}/boot.img overlays
for DTB in ${DT_OVERLAYS}; do
- DTB_BASE_NAME=`basename ${DTB} .dtb`
+ DTB_EXT=${DTB##*.}
+ DTB_BASE_NAME=`basename ${DTB} ."${DTB_EXT}"`
- mcopy -i ${WORKDIR}/boot.img -s
${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTB_BASE_NAME}.dtb
::overlays/${DTB_BASE_NAME}.dtb
+ mcopy -i ${WORKDIR}/boot.img -s
${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTB_BASE_NAME}.${DTB_EXT}
::overlays/${DTB_BASE_NAME}.${DTB_EXT}
done
fi
case "${KERNEL_IMAGETYPE}" in
--
2.9.2
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [meta-raspberrypi][PATCH 06/23] rpi-base.inc: add vc4-kms-v3d to the overlays to support vc4graphics
From: Herve Jourdain Signed-off-by: Herve Jourdain Signed-off-by: Khem Raj --- conf/machine/include/rpi-base.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/machine/include/rpi-base.inc b/conf/machine/include/rpi-base.inc index 47eb23b..aabc131 100644 --- a/conf/machine/include/rpi-base.inc +++ b/conf/machine/include/rpi-base.inc @@ -37,6 +37,7 @@ KERNEL_DEVICETREE ?= " \ overlays/w1-gpio.dtbo \ overlays/w1-gpio-pullup.dtbo \ overlays/pi3-miniuart-bt.dtbo \ +overlays/vc4-kms-v3d.dtbo \ " KERNEL_IMAGETYPE ?= "Image" -- 2.9.2 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [meta-raspberrypi][PATCH 07/23] raspberrypi.conf: set the default value of VC4_CMA_SIZE to support vc4graphics
From: Herve Jourdain Signed-off-by: Herve Jourdain Signed-off-by: Khem Raj --- conf/machine/raspberrypi.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/machine/raspberrypi.conf b/conf/machine/raspberrypi.conf index 72beeb8..df8194c 100644 --- a/conf/machine/raspberrypi.conf +++ b/conf/machine/raspberrypi.conf @@ -10,3 +10,5 @@ include conf/machine/include/rpi-base.inc SERIAL_CONSOLE = "115200 ttyAMA0" UBOOT_MACHINE = "rpi_config" +VC4_CMA_SIZE_raspberrypi ?= "cma-64" + -- 2.9.2 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [meta-raspberrypi][PATCH 08/23] raspberrypi0.conf: set the default value of VC4_CMA_SIZE to support vc4graphics
From: Herve Jourdain
Signed-off-by: Herve Jourdain
Signed-off-by: Khem Raj
---
conf/machine/raspberrypi0.conf | 2 ++
1 file changed, 2 insertions(+)
diff --git a/conf/machine/raspberrypi0.conf b/conf/machine/raspberrypi0.conf
index ccf9ae7..0df9121 100644
--- a/conf/machine/raspberrypi0.conf
+++ b/conf/machine/raspberrypi0.conf
@@ -6,3 +6,5 @@ MACHINEOVERRIDES = "raspberrypi:${MACHINE}"
include conf/machine/raspberrypi.conf
SERIAL_CONSOLE = "115200 ttyAMA0"
+VC4_CMA_SIZE ?= "cma-128"
+
--
2.9.2
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [meta-raspberrypi][PATCH 09/23] raspberrypi2.conf: set the default value of VC4_CMA_SIZE to support vc4graphics
From: Herve Jourdain Signed-off-by: Herve Jourdain Signed-off-by: Khem Raj --- conf/machine/raspberrypi2.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/machine/raspberrypi2.conf b/conf/machine/raspberrypi2.conf index d50ef70..3f13dc0 100644 --- a/conf/machine/raspberrypi2.conf +++ b/conf/machine/raspberrypi2.conf @@ -10,3 +10,5 @@ include conf/machine/include/rpi-base.inc SERIAL_CONSOLE = "115200 ttyAMA0" UBOOT_MACHINE = "rpi_2_config" +VC4_CMA_SIZE ?= "cma-256" + -- 2.9.2 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [meta-raspberrypi][PATCH 10/23] raspberrypi3.conf: set the default value of VC4_CMA_SIZE to support vc4graphics
From: Herve Jourdain Signed-off-by: Herve Jourdain Signed-off-by: Khem Raj --- conf/machine/raspberrypi3.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/machine/raspberrypi3.conf b/conf/machine/raspberrypi3.conf index cb6056e..438c6e6 100644 --- a/conf/machine/raspberrypi3.conf +++ b/conf/machine/raspberrypi3.conf @@ -9,3 +9,5 @@ MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-brcm43430" include conf/machine/raspberrypi2.conf SERIAL_CONSOLE = "115200 ttyS0" +VC4_CMA_SIZE ?= "cma-256" + -- 2.9.2 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [meta-raspberrypi][PATCH 12/23] wayland/weston_%.bbappend: modify configuration options to support vc4graphics
From: Herve Jourdain
Signed-off-by: Herve Jourdain
Signed-off-by: Khem Raj
---
recipes-graphics/wayland/weston_%.bbappend | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/recipes-graphics/wayland/weston_%.bbappend
b/recipes-graphics/wayland/weston_%.bbappend
index c3a7421..57b8079 100644
--- a/recipes-graphics/wayland/weston_%.bbappend
+++ b/recipes-graphics/wayland/weston_%.bbappend
@@ -1,4 +1,2 @@
-EXTRA_OECONF_append_rpi = "\
---enable-rpi-compositor \
-WESTON_NATIVE_BACKEND=rpi-backend.so \
- "
+EXTRA_OECONF_append_rpi = "${@bb.utils.contains('MACHINE_FEATURES',
'vc4graphics', '', ' --enable-rpi-compositor
WESTON_NATIVE_BACKEND=rpi-backend.so', d)}"
+
--
2.9.2
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [meta-raspberrypi][PATCH 11/23] rpi-config_git.bb: add v4c overlay to config.txt to support vc4graphics
From: Herve Jourdain
Signed-off-by: Herve Jourdain
Signed-off-by: Khem Raj
---
recipes-bsp/bootfiles/rpi-config_git.bb | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/recipes-bsp/bootfiles/rpi-config_git.bb
b/recipes-bsp/bootfiles/rpi-config_git.bb
index 4bc8eb7..f610718 100644
--- a/recipes-bsp/bootfiles/rpi-config_git.bb
+++ b/recipes-bsp/bootfiles/rpi-config_git.bb
@@ -13,12 +13,14 @@ SRC_URI =
"git://github.com/Evilpaul/RPi-config.git;protocol=git;branch=master \
S = "${WORKDIR}/git"
-PR = "r4"
+PR = "r5"
PITFT="${@bb.utils.contains("MACHINE_FEATURES", "pitft", "1", "0", d)}"
PITFT22="${@bb.utils.contains("MACHINE_FEATURES", "pitft22", "1", "0", d)}"
PITFT28r="${@bb.utils.contains("MACHINE_FEATURES", "pitft28r", "1", "0", d)}"
+VC4GRAPHICS="${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "1", "0",
d)}"
+
inherit deploy
do_deploy() {
@@ -102,6 +104,12 @@ do_deploy() {
echo "# Enable UART" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
echo "enable_uart=1" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
fi
+
+# VC4 Graphics support
+if [ "${VC4GRAPHICS}" = "1" ]; then
+echo "# Enable VC4 Graphics" >>
${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+echo "dtoverlay=vc4-kms-v3d,${VC4_CMA_SIZE}" >>
${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+fi
}
addtask deploy before do_package after do_install
--
2.9.2
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [meta-raspberrypi][PATCH 14/23] mesa_%.bbappend: new file to add the correct configuration options to support vc4graphics
From: Herve Jourdain Signed-off-by: Herve Jourdain Signed-off-by: Khem Raj --- recipes-graphics/mesa/mesa_%.bbappend | 4 1 file changed, 4 insertions(+) create mode 100644 recipes-graphics/mesa/mesa_%.bbappend diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend new file mode 100644 index 000..b182388 --- /dev/null +++ b/recipes-graphics/mesa/mesa_%.bbappend @@ -0,0 +1,4 @@ +PACKAGECONFIG_append_rpi = " gallium" +GALLIUMDRIVERS_rpi = "vc4" +DRIDRIVERS_rpi = "" + -- 2.9.2 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [meta-raspberrypi][PATCH 13/23] weston/weston_%.bbappend: modify configuration options to support vc4graphics
From: Herve Jourdain
Signed-off-by: Herve Jourdain
Signed-off-by: Khem Raj
---
recipes-graphics/weston/weston_%.bbappend | 13 +++--
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/recipes-graphics/weston/weston_%.bbappend
b/recipes-graphics/weston/weston_%.bbappend
index 3ec311d..70f4360 100644
--- a/recipes-graphics/weston/weston_%.bbappend
+++ b/recipes-graphics/weston/weston_%.bbappend
@@ -1,7 +1,8 @@
-EXTRA_OECONF += "--enable-rpi-compositor \
- --disable-resize-optimization \
- --disable-setuid-install \
- --disable-xwayland-test \
- --disable-simple-egl-clients \
- WESTON_NATIVE_BACKEND=rpi-backend.so \
+PACKAGECONFIG_rpi_remove = "${@bb.utils.contains('MACHINE_FEATURES',
'vc4graphics', ' fbdev', '', d)}"
+EXTRA_OECONF += "--disable-xwayland-test \
+ --disable-simple-egl-clients \
"
+EXTRA_OECONF += "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '',
'--enable-rpi-compositor', d)}"
+EXTRA_OECONF += "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '',
'--disable-resize-optimization', d)}"
+EXTRA_OECONF += "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '',
'--disable-setuid-install', d)}"
+EXTRA_OECONF += "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '',
'WESTON_NATIVE_BACKEND=rpi-backend.so', d)}"
--
2.9.2
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [meta-raspberrypi][PATCH 15/23] linux-rpi.inc: add the configuration options required to support vc4graphics
From: Herve Jourdain
Signed-off-by: Herve Jourdain
Signed-off-by: Khem Raj
---
recipes-kernel/linux/linux-rpi.inc | 10 ++
1 file changed, 10 insertions(+)
diff --git a/recipes-kernel/linux/linux-rpi.inc
b/recipes-kernel/linux/linux-rpi.inc
index 4b65fc2..3eeefee 100644
--- a/recipes-kernel/linux/linux-rpi.inc
+++ b/recipes-kernel/linux/linux-rpi.inc
@@ -111,6 +111,16 @@ do_configure_prepend() {
# Activate CONFIG_LEGACY_PTYS
kernel_configure_variable LEGACY_PTYS y
+# Activate the configuration options for VC4
+VC4GRAPHICS="${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "1",
"0", d)}"
+if [ ${VC4GRAPHICS} = "1" ]; then
+kernel_configure_variable I2C_BCM2835 y
+kernel_configure_variable DRM y
+kernel_configure_variable DRM_FBDEV_EMULATION n
+kernel_configure_variable DRM_VC4 y
+kernel_configure_variable FB_BCM2708 n
+fi
+
# Keep this the last line
# Remove all modified configs and add the rest to .config
sed -e "${CONF_SED_SCRIPT}" < '${WORKDIR}/defconfig' >> '${B}/.config'
--
2.9.2
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [meta-raspberrypi][PATCH 17/23] linux-raspberrypi_4.4: upgrade to 4.4.16
Signed-off-by: Khem Raj
---
recipes-kernel/linux/linux-raspberrypi_4.4.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/recipes-kernel/linux/linux-raspberrypi_4.4.bb
b/recipes-kernel/linux/linux-raspberrypi_4.4.bb
index 8fe5330..9a49dc1 100644
--- a/recipes-kernel/linux/linux-raspberrypi_4.4.bb
+++ b/recipes-kernel/linux/linux-raspberrypi_4.4.bb
@@ -1,8 +1,8 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
-LINUX_VERSION ?= "4.4.13"
+LINUX_VERSION ?= "4.4.16"
-SRCREV = "680be5e27a9593cf26079c6e5744a04cc2809d13"
+SRCREV = "cff67c7e03f4333149f2a8f6eafd3bc44475114a"
SRC_URI =
"git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-4.4.y \
file://0001-fix-dtbo-rules.patch \
file://0002-vc4-ioctl-rendering-allow.patch \
--
2.9.2
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [meta-raspberrypi][PATCH 21/23] vc4graphics: Support X11 with the VC4 driver.
From: Carlos Alberto Lopez Perez
* We need to use the X11 modesetting driver with VC4.
* We need to build at least the mesa swrast DRI driver.
(its already the default so don't overwrite it to empty)
Signed-off-by: Carlos Alberto Lopez Perez
Signed-off-by: Khem Raj
---
conf/machine/include/rpi-base.inc | 2 +-
recipes-graphics/mesa/mesa_%.bbappend | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/conf/machine/include/rpi-base.inc
b/conf/machine/include/rpi-base.inc
index aabc131..69774f4 100644
--- a/conf/machine/include/rpi-base.inc
+++ b/conf/machine/include/rpi-base.inc
@@ -12,7 +12,7 @@ XSERVER = " \
xf86-input-evdev \
xf86-input-mouse \
xf86-input-keyboard \
-xf86-video-fbdev \
+${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics",
"xf86-video-modesetting", "xf86-video-fbdev", d)} \
"
# Really supported starting from linux-raspberrypi 3.18.y only
diff --git a/recipes-graphics/mesa/mesa_%.bbappend
b/recipes-graphics/mesa/mesa_%.bbappend
index b182388..9c5df99 100644
--- a/recipes-graphics/mesa/mesa_%.bbappend
+++ b/recipes-graphics/mesa/mesa_%.bbappend
@@ -1,4 +1,2 @@
PACKAGECONFIG_append_rpi = " gallium"
GALLIUMDRIVERS_rpi = "vc4"
-DRIDRIVERS_rpi = ""
-
--
2.9.2
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [meta-raspberrypi][PATCH 18/23] linux-raspberrypi: Add recipe for 4.7 release
Signed-off-by: Khem Raj
---
.../0001-fix-dtbo-rules.patch | 44 ++
recipes-kernel/linux/linux-raspberrypi_4.7.bb | 9 +
2 files changed, 53 insertions(+)
create mode 100644
recipes-kernel/linux/linux-raspberrypi-4.7/0001-fix-dtbo-rules.patch
create mode 100644 recipes-kernel/linux/linux-raspberrypi_4.7.bb
diff --git
a/recipes-kernel/linux/linux-raspberrypi-4.7/0001-fix-dtbo-rules.patch
b/recipes-kernel/linux/linux-raspberrypi-4.7/0001-fix-dtbo-rules.patch
new file mode 100644
index 000..5113e23
--- /dev/null
+++ b/recipes-kernel/linux/linux-raspberrypi-4.7/0001-fix-dtbo-rules.patch
@@ -0,0 +1,44 @@
+From 13c8784da3dbd977f64cec740eba775b6fab11c2 Mon Sep 17 00:00:00 2001
+From: Herve Jourdain
+Date: Fri, 20 May 2016 16:02:23 +0800
+Subject: [yocto][meta-raspberrypi][PATCH v4 4/5] linux-raspberrypi_4.4.inc:
+ support for .dtbo files for dtb overlays
+
+Upstream-Status: Pending
+
+Kernel 4.4.6+ on RaspberryPi support .dtbo files for overlays, instead of .dtb.
+Patch the kernel, which has faulty rules to generate .dtbo the way yocto does
+
+Signed-off-by: Herve Jourdain
+---
+ .../0001-fix-dtbo-rules.patch | 27 ++
+ 1 file changed, 27 insertions(+)
+ create mode 100644
recipes-kernel/linux/linux-raspberrypi-4.4/0001-fix-dtbo-rules.patch
+
+diff --git a/arch/arm/Makefile b/arch/arm/Makefile
+index a2e7cf7..673c1cb 100644
+--- a/arch/arm/Makefile
b/arch/arm/Makefile
+@@ -333,6 +333,8 @@ $(INSTALL_TARGETS):
+
+ %.dtb: | scripts
+ $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@
++%.dtbo: | scripts
++ $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@
+
+ PHONY += dtbs dtbs_install
+
+diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
+index 3079c4f..6cc3766 100644
+--- a/scripts/Makefile.lib
b/scripts/Makefile.lib
+@@ -293,7 +293,8 @@ $(obj)/%.dtb: $(src)/%.dts FORCE
+ $(call if_changed_dep,dtc)
+
+ quiet_cmd_dtco = DTCO$@
+-cmd_dtco = $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \
++cmd_dtco = mkdir -p $(dir ${dtc-tmp}) ; \
++ $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \
+ $(objtree)/scripts/dtc/dtc -@ -H epapr -O dtb -o $@ -b 0 \
+ -i $(dir $<) $(DTC_FLAGS) \
+ -d $(depfile).dtc.tmp $(dtc-tmp) ; \
diff --git a/recipes-kernel/linux/linux-raspberrypi_4.7.bb
b/recipes-kernel/linux/linux-raspberrypi_4.7.bb
new file mode 100644
index 000..44ac961
--- /dev/null
+++ b/recipes-kernel/linux/linux-raspberrypi_4.7.bb
@@ -0,0 +1,9 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
+
+LINUX_VERSION ?= "4.7.0"
+
+SRCREV = "d38b45a21294eaf01aa7568aaeb161d7553477e9"
+SRC_URI =
"git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-4.7.y \
+ file://0001-fix-dtbo-rules.patch \
+"
+require linux-raspberrypi.inc
--
2.9.2
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [meta-raspberrypi][PATCH 23/23] weston: Fix typo with override
Signed-off-by: Khem Raj
---
recipes-graphics/weston/weston_%.bbappend | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/recipes-graphics/weston/weston_%.bbappend
b/recipes-graphics/weston/weston_%.bbappend
index 70f4360..b964542 100644
--- a/recipes-graphics/weston/weston_%.bbappend
+++ b/recipes-graphics/weston/weston_%.bbappend
@@ -1,4 +1,4 @@
-PACKAGECONFIG_rpi_remove = "${@bb.utils.contains('MACHINE_FEATURES',
'vc4graphics', ' fbdev', '', d)}"
+PACKAGECONFIG_remove_rpi = "${@bb.utils.contains('MACHINE_FEATURES',
'vc4graphics', ' fbdev', '', d)}"
EXTRA_OECONF += "--disable-xwayland-test \
--disable-simple-egl-clients \
"
--
2.9.2
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [meta-raspberrypi][PATCH 16/23] linux-raspberrypi-4.4: add patch to enable proper operation of renderD128 device
From: Herve Jourdain
Signed-off-by: Herve Jourdain
Signed-off-by: Khem Raj
---
.../0002-vc4-ioctl-rendering-allow.patch | 29 ++
recipes-kernel/linux/linux-raspberrypi_4.4.bb | 1 +
2 files changed, 30 insertions(+)
create mode 100644
recipes-kernel/linux/linux-raspberrypi-4.4/0002-vc4-ioctl-rendering-allow.patch
diff --git
a/recipes-kernel/linux/linux-raspberrypi-4.4/0002-vc4-ioctl-rendering-allow.patch
b/recipes-kernel/linux/linux-raspberrypi-4.4/0002-vc4-ioctl-rendering-allow.patch
new file mode 100644
index 000..59d0ed7
--- /dev/null
+++
b/recipes-kernel/linux/linux-raspberrypi-4.4/0002-vc4-ioctl-rendering-allow.patch
@@ -0,0 +1,29 @@
+This patch has been accepted upstream in kernel 4.7-rc3
+But it has not yet been backported to 4.4...
+Upstream-Status: Accepted
[http://www.gossamer-threads.com/lists/linux/kernel/2459302]
+Signed-off-by: Herve Jourdain
+---
+
+diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c
+index a5b68c1..14b5ec1 100644
+--- a/drivers/gpu/drm/vc4/vc4_drv.c
b/drivers/gpu/drm/vc4/vc4_drv.c
+@@ -75,12 +75,12 @@ static const struct file_operations vc4_drm_fops = {
+ };
+
+ static const struct drm_ioctl_desc vc4_drm_ioctls[] = {
+- DRM_IOCTL_DEF_DRV(VC4_SUBMIT_CL, vc4_submit_cl_ioctl, 0),
+- DRM_IOCTL_DEF_DRV(VC4_WAIT_SEQNO, vc4_wait_seqno_ioctl, 0),
+- DRM_IOCTL_DEF_DRV(VC4_WAIT_BO, vc4_wait_bo_ioctl, 0),
+- DRM_IOCTL_DEF_DRV(VC4_CREATE_BO, vc4_create_bo_ioctl, 0),
+- DRM_IOCTL_DEF_DRV(VC4_MMAP_BO, vc4_mmap_bo_ioctl, 0),
+- DRM_IOCTL_DEF_DRV(VC4_CREATE_SHADER_BO, vc4_create_shader_bo_ioctl, 0),
++ DRM_IOCTL_DEF_DRV(VC4_SUBMIT_CL, vc4_submit_cl_ioctl,
0|DRM_RENDER_ALLOW),
++ DRM_IOCTL_DEF_DRV(VC4_WAIT_SEQNO, vc4_wait_seqno_ioctl,
0|DRM_RENDER_ALLOW),
++ DRM_IOCTL_DEF_DRV(VC4_WAIT_BO, vc4_wait_bo_ioctl, 0|DRM_RENDER_ALLOW),
++ DRM_IOCTL_DEF_DRV(VC4_CREATE_BO, vc4_create_bo_ioctl,
0|DRM_RENDER_ALLOW),
++ DRM_IOCTL_DEF_DRV(VC4_MMAP_BO, vc4_mmap_bo_ioctl, 0|DRM_RENDER_ALLOW),
++ DRM_IOCTL_DEF_DRV(VC4_CREATE_SHADER_BO, vc4_create_shader_bo_ioctl,
0|DRM_RENDER_ALLOW),
+ DRM_IOCTL_DEF_DRV(VC4_GET_HANG_STATE, vc4_get_hang_state_ioctl,
+ DRM_ROOT_ONLY),
+ };
diff --git a/recipes-kernel/linux/linux-raspberrypi_4.4.bb
b/recipes-kernel/linux/linux-raspberrypi_4.4.bb
index b13925c..8fe5330 100644
--- a/recipes-kernel/linux/linux-raspberrypi_4.4.bb
+++ b/recipes-kernel/linux/linux-raspberrypi_4.4.bb
@@ -5,5 +5,6 @@ LINUX_VERSION ?= "4.4.13"
SRCREV = "680be5e27a9593cf26079c6e5744a04cc2809d13"
SRC_URI =
"git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-4.4.y \
file://0001-fix-dtbo-rules.patch \
+ file://0002-vc4-ioctl-rendering-allow.patch \
"
require linux-raspberrypi.inc
--
2.9.2
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [meta-raspberrypi][PATCH 19/23] linux-raspberrypi_3.18: Remove
Signed-off-by: Khem Raj
---
.../0001-dts-add-overlay-for-pitft22.patch | 110 -
recipes-kernel/linux/linux-raspberrypi_3.18.bb | 14 ---
2 files changed, 124 deletions(-)
delete mode 100644
recipes-kernel/linux/linux-raspberrypi-3.18/0001-dts-add-overlay-for-pitft22.patch
delete mode 100644 recipes-kernel/linux/linux-raspberrypi_3.18.bb
diff --git
a/recipes-kernel/linux/linux-raspberrypi-3.18/0001-dts-add-overlay-for-pitft22.patch
b/recipes-kernel/linux/linux-raspberrypi-3.18/0001-dts-add-overlay-for-pitft22.patch
deleted file mode 100644
index fa73599..000
---
a/recipes-kernel/linux/linux-raspberrypi-3.18/0001-dts-add-overlay-for-pitft22.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From 2f44861e2a2d651a9aa62a75343a032fee33e93b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petter=20Mab=C3=A4cker?=
-Date: Fri, 8 Jan 2016 09:02:44 +0100
-Subject: [PATCH] dts: add overlay for pitft22 in linux 3.18
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Pending
-
-Add the pitft22 overlay from adafruit Adafruit-Pi-Kernel-o-Matic repo:
-https://github.com/adafruit/Adafruit-Pi-Kernel-o-Matic
-
-Signed-off-by: Petter Mabäcker
- arch/arm/boot/dts/overlays/Makefile| 1 +
- arch/arm/boot/dts/overlays/pitft22-overlay.dts | 69 ++
- 2 files changed, 70 insertions(+)
- create mode 100755 arch/arm/boot/dts/overlays/pitft22-overlay.dts
-
-diff --git a/arch/arm/boot/dts/overlays/Makefile
b/arch/arm/boot/dts/overlays/Makefile
-index c766616..1eaaf81 100644
a/arch/arm/boot/dts/overlays/Makefile
-+++ b/arch/arm/boot/dts/overlays/Makefile
-@@ -27,6 +27,7 @@ dtb-$(RPI_DT_OVERLAYS) += mcp2515-can0-overlay.dtb
- dtb-$(RPI_DT_OVERLAYS) += mmc-overlay.dtb
- dtb-$(RPI_DT_OVERLAYS) += mz61581-overlay.dtb
- dtb-$(RPI_DT_OVERLAYS) += piscreen-overlay.dtb
-+dtb-$(RPI_DT_OVERLAYS) += pitft22-overlay.dtb
- dtb-$(RPI_DT_OVERLAYS) += pitft28-resistive-overlay.dtb
- dtb-$(RPI_DT_OVERLAYS) += pps-gpio-overlay.dtb
- dtb-$(RPI_DT_OVERLAYS) += rpi-dac-overlay.dtb
-diff --git a/arch/arm/boot/dts/overlays/pitft22-overlay.dts
b/arch/arm/boot/dts/overlays/pitft22-overlay.dts
-new file mode 100755
-index 000..894ba22
/dev/null
-+++ b/arch/arm/boot/dts/overlays/pitft22-overlay.dts
-@@ -0,0 +1,69 @@
-+/*
-+ * Device Tree overlay for pitft by Adafruit
-+ *
-+ */
-+
-+/dts-v1/;
-+/plugin/;
-+
-+/ {
-+compatible = "brcm,bcm2835", "brcm,bcm2708", "brcm,bcm2709";
-+
-+fragment@0 {
-+target = <&spi0>;
-+__overlay__ {
-+status = "okay";
-+
-+spidev@0{
-+status = "disabled";
-+};
-+
-+spidev@1{
-+status = "disabled";
-+};
-+};
-+};
-+
-+fragment@1 {
-+target = <&gpio>;
-+__overlay__ {
-+pitft_pins: pitft_pins {
-+brcm,pins = <25>;
-+brcm,function = <1>; /* out */
-+brcm,pull = <0>; /* none */
-+};
-+};
-+};
-+
-+fragment@2 {
-+target = <&spi0>;
-+__overlay__ {
-+/* needed to avoid dtc warning */
-+#address-cells = <1>;
-+#size-cells = <0>;
-+
-+pitft: pitft@0{
-+compatible = "ilitek,ili9340";
-+reg = <0>;
-+pinctrl-names = "default";
-+pinctrl-0 = <&pitft_pins>;
-+
-+spi-max-frequency = <3200>;
-+rotate = <90>;
-+fps = <25>;
-+bgr;
-+buswidth = <8>;
-+dc-gpios = <&gpio 25 0>;
-+debug = <0>;
-+};
-+
-+};
-+};
-+
-+__overrides__ {
-+speed = <&pitft>,"spi-max-frequency:0";
-+rotate = <&pitft>,"rotate:0";
-+fps = <&pitft>,"fps:0";
-+debug = <&pitft>,"debug:0";
-+};
-+};
---
-1.9.1
-
diff --git a/recipes-kernel/linux/linux-raspberrypi_3.18.bb
b/recipes-kernel/linux/linux-raspberrypi_3.18.bb
deleted file mode 100644
index 1110b71..000
--- a/recipes-kernel/linux/linux-raspberrypi_3.18.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
-
-LINUX_VERSION ?= "3.18.16"
-
-SRCREV = "1bb18c8f721ef674a447f3622273f2e2de7a205c"
-SRC_URI =
"git://github.com/raspberrypi/linux.git;protocol=git;branch=rpi-3.18.y \
-
[yocto] [meta-raspberrypi][PATCH 22/23] Switch to using 4.4 as default kernel
Signed-off-by: Khem Raj --- conf/machine/include/rpi-default-versions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/machine/include/rpi-default-versions.inc b/conf/machine/include/rpi-default-versions.inc index c879dde..e65a4ae 100644 --- a/conf/machine/include/rpi-default-versions.inc +++ b/conf/machine/include/rpi-default-versions.inc @@ -1,3 +1,3 @@ # RaspberryPi BSP default versions -PREFERRED_VERSION_linux-raspberrypi ?= "4.1.%" +PREFERRED_VERSION_linux-raspberrypi ?= "4.4.%" -- 2.9.2 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [meta-raspberrypi][PATCH 20/23] firmware, userland: Bump to latest
firmware -> 20160726
userland -> 20160728
Signed-off-by: Khem Raj
---
recipes-bsp/common/firmware.inc| 4 +-
...-applications-to-set-next-resource-handle.patch | 10 ++--
...ayland-Add-support-for-the-Wayland-winsys.patch | 65 --
.../0003-wayland-Add-Wayland-example.patch | 2 +-
...-wayland-egl-Add-bcm_host-to-dependencies.patch | 2 +-
...emove-faulty-assert-to-make-weston-happy-.patch | 2 +-
...6-zero-out-wl-buffers-in-egl_surface_free.patch | 4 +-
...007-initialize-front-back-wayland-buffers.patch | 4 +-
.../userland/userland/0008-Remove-RPC_FLUSH.patch | 2 +-
.../userland/0009-fix-cmake-dependency-race.patch | 4 +-
.../0010-Fix-enum-conversion-warnings.patch| 2 +-
...Fix-for-framerate-with-nested-composition.patch | 2 +-
.../0012-build-shared-library-for-vchostif.patch | 4 +-
...nt-buffer-wrapping-interface-for-dispmanx.patch | 2 +-
recipes-graphics/userland/userland_git.bb | 2 +-
15 files changed, 59 insertions(+), 52 deletions(-)
diff --git a/recipes-bsp/common/firmware.inc b/recipes-bsp/common/firmware.inc
index 9df6156..a9d2327 100644
--- a/recipes-bsp/common/firmware.inc
+++ b/recipes-bsp/common/firmware.inc
@@ -1,5 +1,5 @@
-RPIFW_SRCREV ?= "390f53ed0fd79df274bdcc81d99e09fa262f03ab"
-RPIFW_DATE ?= "20160622"
+RPIFW_SRCREV ?= "1205048f037098b1532bb947d1f4b823bcdebdf7"
+RPIFW_DATE ?= "20160726"
RPIFW_SRC_URI ?=
"git://github.com/raspberrypi/firmware.git;protocol=git;branch=master"
RPIFW_S ?= "${WORKDIR}/git"
diff --git
a/recipes-graphics/userland/userland/0001-Allow-applications-to-set-next-resource-handle.patch
b/recipes-graphics/userland/userland/0001-Allow-applications-to-set-next-resource-handle.patch
index 4d026bd..8c855da 100644
---
a/recipes-graphics/userland/userland/0001-Allow-applications-to-set-next-resource-handle.patch
+++
b/recipes-graphics/userland/userland/0001-Allow-applications-to-set-next-resource-handle.patch
@@ -1,4 +1,4 @@
-From 83c5ac5892d0cd29caa8922ff8b639b9a373c3cb Mon Sep 17 00:00:00 2001
+From a096ab4b7bbdd8f78d93a54a8da1ca3c9470c2ec Mon Sep 17 00:00:00 2001
From: Dom Cobley
Date: Tue, 9 Jul 2013 09:26:26 -0400
Subject: [PATCH 01/13] Allow applications to set next resource handle
@@ -16,10 +16,10 @@ It's useful for implementing, say, a buffer carousel.
6 files changed, 59 insertions(+), 7 deletions(-)
diff --git a/interface/khronos/common/khrn_client_rpc.h
b/interface/khronos/common/khrn_client_rpc.h
-index 418aa67..a7557a8 100644
+index dc4351d..10ea060 100644
--- a/interface/khronos/common/khrn_client_rpc.h
+++ b/interface/khronos/common/khrn_client_rpc.h
-@@ -683,6 +683,7 @@ static INLINE void
rpc_call12_out_ctrl(CLIENT_THREAD_STATE_T *thread,uint32_t id
+@@ -685,6 +685,7 @@ static INLINE void
rpc_call12_out_ctrl(CLIENT_THREAD_STATE_T *thread,uint32_t id
static INLINE void rpc_call13_out_ctrl(CLIENT_THREAD_STATE_T *thread,uint32_t
id, uint32_t p0, uint32_t p1, uint32_t p2, uint32_t p3, uint32_t p4, uint32_t
p5, uint32_t p6, uint32_t p7, uint32_t p8, uint32_t p9, uint32_t p10, uint32_t
p11, void *out) { rpc_begin(thread); RPC_CALL(thread, id, p0, p1,
p2, p3, p4, p5, p6, p7, p8, p9, p10, p11); rpc_recv(thread, out, NULL,
(RPC_RECV_FLAG_T)(RPC_RECV_FLAG_CTRL | RPC_RECV_FLAG_LEN)); rpc_end(thread); }
static INLINE void rpc_call14_out_ctrl(CLIENT_THREAD_STATE_T *thread,uint32_t
id, uint32_t p0, uint32_t p1, uint32_t p2, uint32_t p3, uint32_t p4, uint32_t
p5, uint32_t p6, uint32_t p7, uint32_t p8, uint32_t p9, uint32_t p10, uint32_t
p11, uint32_t p12, void *out) { rpc_begin(thread); RPC_CALL(thread, id, p0, p1,
p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12); rpc_recv(thread, out, NULL,
(RPC_RECV_FLAG_T)(RPC_RECV_FLAG_CTRL | RPC_RECV_FLAG_LEN)); rpc_end(thread); }
static INLINE void rpc_call15_out_ctrl(CLIENT_THREAD_STATE_T *thread,uint32_t
id, uint32_t p0, uint32_t p1, uint32_t p2, uint32_t p3, uint32_t p4, uint32_t
p5, uint32_t p6, uint32_t p7, uint32_t p8, uint32_t p9, uint32_t p10, uint32_t
p11, uint32_t p12, uint32_t p13, void *out) { rpc_begin(thread);
RPC_CALL(thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12,
p13); rpc_recv(thread, out, NULL, (RPC_RECV_FLAG_T)(RPC_RECV_FLAG_CTRL |
RPC_RECV_FLAG_LEN)); rpc_end(thread); }
@@ -27,7 +27,7 @@ index 418aa67..a7557a8 100644
#endif
#define RPC_CALL1_OUT_CTRL(fn, thread, id, out)
rpc_call1_out_ctrl(thread, id, out)
-@@ -700,6 +701,7 @@ static INLINE void
rpc_call15_out_ctrl(CLIENT_THREAD_STATE_T *thread,uint32_t id
+@@ -702,6 +703,7 @@ static INLINE void
rpc_call15_out_ctrl(CLIENT_THREAD_STATE_T *thread,uint32_t id
#define RPC_CALL13_OUT_CTRL(fn, thread, id, p0, p1, p2, p3, p4, p5, p6, p7,
p8, p9, p10, p11, out) rpc_call13_out_ctrl(thread, id, p0, p1, p2, p3, p4,
p5, p6, p7, p8, p9, p10, p11, out)
#define RPC_CALL14_OUT_CTRL(fn, thread, id, p0, p1, p2, p3, p4, p5, p6, p7,
p8, p9, p10
