> On Apr 26, 2017, at 15:37, Philip Balister <phi...@balister.org> wrote: > > I'd be happiest if meta-xilinx used upstream u-boot and a bbappend to > add patches that are not upstream yet. This way we (the consumers) know > exactly what the delta is to upstream.
Just for reference, you could also: git clone -o origin upstream git://git.denx.de/u-boot.git cd u-boot git remote add xilinx https://github.com/Xilinx/u-boot-xlnx.git git fetch --all UPSTREAM_SHA1=$(grep "^SRCREV\ \=" ../whatever/u-boot_20xy.z.bb | sed "s/.*\"\(.*\)\".*/\1/g") git co $UPSTREAM_SHA1 XLNX_SHA1=$(grep "^SRCREV\ \=" ../whatever/u-boot-xlnx_20xy.z.bb | sed "s/.*\"\(.*\)\".*/\1/g") git merge --no-commit --no-ff $XLNX_SHA1 [... inspect ...] git merge --abort ;) Sorry, not trying to be a smart ass, just documenting for posterity. -- _______________________________________________ meta-xilinx mailing list meta-xilinx@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-xilinx
