Message ID | 20230523153608.119800-1-frieder@fris.de |
---|---|
State | New |
Headers | show |
Series | psmisc: Set ALTERNATIVE for pstree to resolve conflict with busybox | expand |
> On 23 May 2023, at 16:36, Frieder Schrempf via lists.openembedded.org <frieder.schrempf=kontron.de@lists.openembedded.org> wrote: > diff --git a/vscode-bitbake-build/executeBitBakeCmd.sh b/vscode-bitbake-build/executeBitBakeCmd.sh > new file mode 100755 > index 0000000000..d7a4c5a5aa > --- /dev/null > +++ b/vscode-bitbake-build/executeBitBakeCmd.sh > @@ -0,0 +1,3 @@ > +#!/bin/bash > +. ./oe-init-build-env vscode-bitbake-build > /dev/null > +bitbake-layers show-layers Pretty certain you didn’t want this in your commit. (you might want to add vscode-bitbake-build to your global git ignore) Ross
On 23.05.23 18:44, Ross Burton wrote: > > >> On 23 May 2023, at 16:36, Frieder Schrempf via lists.openembedded.org <frieder.schrempf=kontron.de@lists.openembedded.org> wrote: >> diff --git a/vscode-bitbake-build/executeBitBakeCmd.sh b/vscode-bitbake-build/executeBitBakeCmd.sh >> new file mode 100755 >> index 0000000000..d7a4c5a5aa >> --- /dev/null >> +++ b/vscode-bitbake-build/executeBitBakeCmd.sh >> @@ -0,0 +1,3 @@ >> +#!/bin/bash >> +. ./oe-init-build-env vscode-bitbake-build > /dev/null >> +bitbake-layers show-layers > > Pretty certain you didn’t want this in your commit. > > (you might want to add vscode-bitbake-build to your global git ignore) Yeah, stupid mistake and not properly checking the patch before sending it. But that's why I sent a v2 just few minutes after this. Sorry for the noise.
diff --git a/meta/recipes-extended/psmisc/psmisc.inc b/meta/recipes-extended/psmisc/psmisc.inc index a429c2ee96..23e98d21be 100644 --- a/meta/recipes-extended/psmisc/psmisc.inc +++ b/meta/recipes-extended/psmisc/psmisc.inc @@ -55,3 +55,5 @@ ALTERNATIVE_PRIORITY = "90" ALTERNATIVE:killall = "killall" ALTERNATIVE:fuser = "fuser" + +ALTERNATIVE:pstree = "pstree" diff --git a/vscode-bitbake-build/executeBitBakeCmd.sh b/vscode-bitbake-build/executeBitBakeCmd.sh new file mode 100755 index 0000000000..d7a4c5a5aa --- /dev/null +++ b/vscode-bitbake-build/executeBitBakeCmd.sh @@ -0,0 +1,3 @@ +#!/bin/bash +. ./oe-init-build-env vscode-bitbake-build > /dev/null +bitbake-layers show-layers \ No newline at end of file