[yocto] [PATCH 0/1] Add SSHD_CONFIG variable description
Add the SSHD_CONFIG variable description to the glossary. This variable is introduced by the following patch series on OE-Core: https://patchwork.openembedded.org/series/4904 David Vincent (1): ref-manual: New SSHD_CONFIG variable description documentation/ref-manual/ref-variables.xml | 21 + 1 file changed, 21 insertions(+) -- 2.11.0 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [PATCH 1/1] ref-manual: New SSHD_CONFIG variable description
Add description for the SSHD_CONFIG variable which is used to select the
package to use as provider for sshd-config.
Signed-off-by: David Vincent
---
documentation/ref-manual/ref-variables.xml | 21 +
1 file changed, 21 insertions(+)
diff --git a/documentation/ref-manual/ref-variables.xml
b/documentation/ref-manual/ref-variables.xml
index 6e15e65f54..803f0da980 100644
--- a/documentation/ref-manual/ref-variables.xml
+++ b/documentation/ref-manual/ref-variables.xml
@@ -12511,6 +12511,27 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR =
"${INC_PR}.3"
+SSHD_CONFIG
+
+SSHD_CONFIG[doc] = "The package used to provide OpenSSH sshd
configuration.
+
+
+
+When selecting "ssh-server-openssh" in
+IMAGE_FEATURES,
+specifies which package should be used as provider for
+sshd-config.
+
+
+
+This defaults to openssh-sshd-config.
+If "read-only-rootfs" is also specified in
+IMAGE_FEATURES,
+it defaults to
openssh-sshd-config-readonly
+
+
+
+
SSTATE_DIR
SSTATE_DIR[doc] = "The directory for the shared state cache."
--
2.11.0
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [yocto-kernel-tools][PATCH 0/1] Rework merge of feature branches
I've recently noticed that, on Morty, feature branches of a Yocto kernel are not merged anymore. This is due to the fact that the meta-series file does not process the git merge commands anymore. This commit creates a new merge command to be executed when processing the kernel metadata. To solve the issue, there is also a patch to send to oe-core for kernel-yocto.bbclass, but I wait for this patch to be included since there is no point without it. David Vincent (1): scc: Move merge command tools/kgit-meta | 14 ++ tools/scc| 13 - tools/scc-cmds/merge.cmd | 10 ++ 3 files changed, 24 insertions(+), 13 deletions(-) create mode 100644 tools/scc-cmds/merge.cmd -- 2.11.0 -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
[yocto] [yocto-kernel-tools][PATCH 1/1] scc: Move merge command
Create a new command to merge a feature branch inside the current branch
when processing meta-series.
Signed-off-by: David Vincent
---
tools/kgit-meta | 14 ++
tools/scc| 13 -
tools/scc-cmds/merge.cmd | 10 ++
3 files changed, 24 insertions(+), 13 deletions(-)
create mode 100644 tools/scc-cmds/merge.cmd
diff --git a/tools/kgit-meta b/tools/kgit-meta
index 1c19ef5..aa5e210 100755
--- a/tools/kgit-meta
+++ b/tools/kgit-meta
@@ -254,6 +254,20 @@ for fline in `cat ${meta_series}`; do
fi
fi
;;
+merge:*)
+b=$(echo ${fline} | cut -d: -f2 | sed 's%^\ %%')
+check_branch ${b}
+if [ $? -ne 0 ]; then
+echo "ERROR. branch ${b} does not exist, can't merge"
+exit 1
+else
+echo "[INFO]: branch merge: ${b}"
+eval git merge -q --no-ff -m \"Merge branch ${b}\" ${b}
+if [ $? -ne 0 ]; then
+exit 1
+fi
+fi
+;;
*)
;;
esac
diff --git a/tools/scc b/tools/scc
index 3d17496..cee9e0d 100755
--- a/tools/scc
+++ b/tools/scc
@@ -286,19 +286,6 @@ set_kernel_version()
KERNEL_VERSION=$1
}
-# Used in feature scripts
-# - convenience wrapper for "git merge"
-# - arguments are git merge and are passed directly to git
-merge()
-{
-args="$@"
-
-# call the git wrapper function. Currently with no modification or
-# checking on the args, but the option of checking in the future is
-# trivial once users have converted.
-git merge $args
-}
-
# used in feature scripts
# - encodes a generic git command
git()
diff --git a/tools/scc-cmds/merge.cmd b/tools/scc-cmds/merge.cmd
new file mode 100644
index 000..02be6ca
--- /dev/null
+++ b/tools/scc-cmds/merge.cmd
@@ -0,0 +1,10 @@
+# used in feature scripts
+#arg1: the branch name
+merge()
+{
+local text
+local mbranch_name=$1
+
+text="merge: ${mbranch_name}"
+eval echo "\$text" $outfile_append
+}
--
2.11.0
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
[yocto] [PATCH] kernel-yocto: Update source tree with kgit-meta
kgit-meta processes a file called meta-series to update the source tree
(create, merge branches, ...). This fixes the merging of feature
branches using the new merge command of yocto-kernel-tools.
Signed-off-by: David Vincent
---
meta/classes/kernel-yocto.bbclass | 13 +
1 file changed, 13 insertions(+)
diff --git a/meta/classes/kernel-yocto.bbclass
b/meta/classes/kernel-yocto.bbclass
index 5cfd8aff50..b37ac01a84 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -162,6 +162,19 @@ do_kernel_metadata() {
bbfatal_log "Could not generate configuration queue for
${KMACHINE}."
fi
fi
+
+ # Update git repository by running kgit-meta
+ cd ${S}
+
+ check_git_config
+ meta_dir=$(kgit --meta)
+ if [ -f "${meta_dir}/meta-series" ]; then
+ kgit-meta ${meta_dir}/meta-series
+ if [ $? -ne 0 ]; then
+ bberror "Could not apply metadata for ${KMACHINE}."
+ bbfatal_log "Failures can be resolved in the linux
source directory ${S})"
+ fi
+ fi
}
do_patch() {
--
2.11.0
--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] [yocto-kernel-tools][PATCH 0/1] Rework merge of feature branches
On dimanche 29 janvier 2017 23:31:49 CET Bruce Ashfield wrote: > On Wed, Jan 25, 2017 at 1:05 PM, Bruce Ashfield > wrote: > > I spent Friday looking into this in more detail, and to keep things > consistent > with how the path and config queues are handled, with all the tree > manipulations > pull out of the various scripts and exposed in the bbclass itself, I ended > up with > a different implementation of the support. > > The kern-tools change is the same as you did (and is your change), the > difference > is in the bbclass processing, where do_patch() modifies the tree, and it > consumes > the output of the meta-data routine .. versus the kgit-meta script itself. Thanks for looking into this and come up with a better implementation. I agree that mine was a little harsh. > The work can be seen in my poky-contrib tree: > > http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=zedd/kernel, > in the > commit "kern-tools: re-enable scc merge command". > > These changes are on master, and passed my testing to merge feature branches > into the branch being built. Saw it, read it and saw that it was now in master-next, ready to be pulled. > > If you are able to try it out (on master), that would be great. I'm going > to let it > soak for a few days, and once it merges to master, it can be ported to > morty. Sorry, I don't have a master build ready but as soon as I can test it whether on morty or master, I will report back. David -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
Re: [yocto] [yocto-kernel-tools][PATCH 0/1] Rework merge of feature branches
On vendredi 3 février 2017 13:51:34 CET Bruce Ashfield wrote: > > I was able to merge branches with this patch applied to Morty. > > Cheers, > > Bruce > I've just successfully tested it on Morty myself. Works for me too, branches are merged just like they were before ! Thank you David -- ___ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
