Had a conflict on
cherry-picking:quadfloor@yocto:~/release_1/src/meta-raspberrypi$ git
fetch --all
quadfloor@yocto:~/release_1/src/meta-raspberrypi$ git fetch -all
error: did you mean `--all` (with two dashes)?
quadfloor@yocto:~/release_1/src/meta-raspberrypi$ git cherry-pick
0917b60527242d3668efc2d3b918df64b13e7b6f
Auto-merging conf/machine/include/rpi-base.inc
CONFLICT (content): Merge conflict in conf/machine/include/rpi-base.inc
error: could not apply 0917b60... rpi-base.inc: Add kernel modules to all images
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
$ git checkout -b kirkstone
git://git.yoctoproject.org/meta-raspberrypi ./src/meta-raspberrypi
$ git fetch --all
$ git cherry-pick 0917b60527242d3668efc2d3b918df64b13e7b6f
Auto-merging conf/machine/include/rpi-base.inc
CONFLICT (content): Merge conflict in conf/machine/include/rpi-base.inc
error: could not apply 0917b60... rpi-base.inc: Add kernel modules to all images
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
Detail about the found conflict:
<<<<<<< HEAD
MACHINE_EXTRA_RRECOMMENDS += "kernel-modules udev-rules-rpi"
MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS +=
"${@oe.utils.conditional('ENABLE_I2C', '1', 'kernel-module-i2c-dev
kernel-module-i2c-bcm2708', '', d)}"
MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS +=
"${@oe.utils.conditional('ENABLE_IR', '1', 'kernel-module-gpio-ir
kernel-module-gpio-ir-tx', '', d)}"
MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS +=
"${@oe.utils.conditional('ENABLE_GPIO_SHUTDOWN', '1', 'gpio-shutdown
kernel-module-gpio-keys', '', d)}"
SERIAL_CONSOLES_CHECK ??= "${SERIAL_CONSOLES}"
# The name of the deploy directory for raspberry pi boot files.
# This variable is referred to by recipes fetching / generating the files.
BOOTFILES_DIR_NAME ?= "bootfiles"
=======
MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " kernel-modules udev-rules-rpi"
>>>>>>> 0917b60 (rpi-base.inc: Add kernel modules to all images)
Seens that MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " kernel-modules
udev-rules-rpi" was already there....
Confused now...
Em sex., 15 de dez. de 2023 às 20:40, Khem Raj <raj.k...@gmail.com> escreveu:
>
> go into meta-raspberrypi checkout and then
>
> then do
> git cherry-pick 0917b60527242d3668efc2d3b918df64b13e7b6f
>
> this should bring the one commit I am asking you to apply on top of kirkstone.
>
> On Fri, Dec 15, 2023 at 3:35 PM Renato Mendes
> <renato.mendes....@gmail.com> wrote:
> >
> >
> > Sorry I’m confused… what exactly Khem asked to do - can you please
> > elaborate. Thanks.
> >
> > Em 15 de dez. de 2023, à(s) 18:51, Martin Jansa <martin.ja...@gmail.com>
> > escreveu:
> >
> >
> > > Am I doing the backport correctly? Maybe config file problems?
> >
> > You've backported different commit than what Khem asked you to try.
> >
> > On Fri, Dec 15, 2023 at 10:33 PM Renato Mendes
> > <renato.mendes....@gmail.com> wrote:
> >>
> >> So Khem, that's what I've done:
> >>
> >> Load from git and backport:
> >>
> >> git clone -b kirkstone git://git.yoctoproject.org/poky ./src/poky
> >> git clone -b kirkstone git://git.openembedded.org/meta-openembedded
> >> ./src/meta-openembedded
> >>
> >> git clone -b kirkstone git://git.yoctoproject.org/meta-raspberrypi
> >> ./src/meta-raspberrypi
> >> git checkout master
> >> git checkout kiskstone
> >> git cherry-pick master
> >> Auto-merging docs/extra-build-config.md
> >> Auto-merging recipes-bsp/bootfiles/rpi-cmdline.bb
> >> [kirkstone a900a5e] rpi-cmdline, rpi-u-boot-src: Support USB boot
> >> Author: Harunobu Kurokawa <harunobu.kurokawa...@renesas.com>
> >> Date: Fri May 5 14:49:51 2023 +0900
> >> Committer: quadfloor <quadfl...@yocto.quadfloor.com>
> >> Your name and email address were configured automatically based
> >> on your username and hostname. Please check that they are accurate.
> >> You can suppress this message by setting them explicitly. Run the
> >> following command and follow the instructions in your editor to edit
> >> your configuration file:
> >>
> >> git config --global --edit
> >>
> >> After doing this, you may fix the identity used for this commit with:
> >>
> >> git commit --amend --reset-author
> >>
> >> 4 files changed, 24 insertions(+), 3 deletions(-)
> >>
> >> Configuration:
> >>
> >> After that, rebuilt with the short configuration:
> >>
> >> MACHINE = "raspberrypi0-wifi"
> >> SERIAL_CONSOLE = ""
> >> DISABLE_RPI_BOOT_LOGO = "1"
> >> DISABLE_OVERSCAN = "1"
> >> DISABLE_SPLASH = "1"
> >> BOOT_DELAY = "0"
> >> GPU_MEM_256 = "128"
> >> GPU_MEM_512 = "196"
> >> GPU_MEM_1024 = "396"
> >> PACKAGE_CLASSES = "package_ipk"
> >> DISTRO_FEATURES:append = " wifi "
> >> IMAGE_INSTALL:append = " linux-firmware-bcm43430 wpa-supplicant"
> >> IMAGE_FSTYPES = "tar.bz2 ext4 rpi-sdimg"
> >> SDIMG_ROOTFS_TYPE = "ext4"
> >>
> >>
> >> $ cat bblayers.conf
> >> # POKY_BBLAYERS_CONF_VERSION is increased each time
> >> build/conf/bblayers.conf
> >> # changes incompatibly
> >> POKY_BBLAYERS_CONF_VERSION = "2"
> >>
> >> BBPATH = "${TOPDIR}"
> >> BBFILES ?= ""
> >>
> >> BBLAYERS ?= " \
> >> /home/quadfloor/release_1/src/poky/meta \
> >> /home/quadfloor/release_1/src/poky/meta-poky \
> >> /home/quadfloor/release_1/src/poky/meta-yocto-bsp \
> >> /home/quadfloor/release_1/src/meta-openembedded/meta-oe \
> >> /home/quadfloor/release_1/src/meta-openembedded/meta-python \
> >> /home/quadfloor/release_1/src/meta-openembedded/meta-multimedia \
> >> /home/quadfloor/release_1/src/meta-openembedded/meta-networking \
> >> /home/quadfloor/release_1/src/meta-raspberrypi \
> >> "
> >>
> >> Result:
> >> $ ifcofing -a -> Only lo interface, no wlan
> >>
> >> $ dmesg | grep brcmfmac shows nothing....
> >> $ dmesg | grep wlan shows nothing....
> >>
> >> $ lsmod
> >> Module Size Used by
> >> nfsd 454656 11
> >>
> >> So, basically the same....
> >>
> >> Am I doing the backport correctly? Maybe config file problems?
> >>
> >> Thanks for supporting...
> >>
> >>
> >>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#61942): https://lists.yoctoproject.org/g/yocto/message/61942
Mute This Topic: https://lists.yoctoproject.org/mt/103150047/21656
Group Owner: yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
