| Message ID | 20240223103550.299992-1-andrew.cooper3@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [LIVEPATCH] Fix inclusion of new object files | expand |
On Fri, Feb 23, 2024 at 10:35 AM Andrew Cooper <andrew.cooper3@citrix.com> wrote: > > Right now, there's a mixup over the xen/ part of the path for new files. > > + NEW_FILES=./arch/x86/lp-hooks.o > + for i in '$NEW_FILES' > ++ dirname ./arch/x86/lp-hooks.o > + mkdir -p output/./arch/x86 > + cp patched/./arch/x86/lp-hooks.o output/./arch/x86/lp-hooks.o > cp: cannot stat 'patched/./arch/x86/lp-hooks.o': No such file or directory > > Alter the `cd` and `find` runes to use paths relative to the root of the > different source trees. > > Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> > --- > CC: Roger Pau Monné <roger.pau@citrix.com> > CC: Ross Lagerwall <ross.lagerwall@citrix.com> > > I'm unsure whether there's a useful fixes tag to use. AFAICT it was broken > even when 0564f0c7a57 claimed to have it working. > --- > livepatch-build | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/livepatch-build b/livepatch-build > index cdb852cc7fea..948b2acfc2f6 100755 > --- a/livepatch-build > +++ b/livepatch-build > @@ -227,7 +227,7 @@ function create_patch() > fi > done > > - NEW_FILES=$(comm -23 <(cd patched/xen && find . -type f -name '*.o' | sort) <(cd original/xen && find . -type f -name '*.o' | sort)) > + NEW_FILES=$(comm -23 <(cd patched && find xen/ -type f -name '*.o' | sort) <(cd original && find xen/ -type f -name '*.o' | sort)) > for i in $NEW_FILES; do > mkdir -p "output/$(dirname "$i")" > cp "patched/$i" "output/$i" > > base-commit: 1b5b03b3ce4187ce99bad580fd0ee36c6337313f > -- Reviewed-by: Ross Lagerwall <ross.lagerwall@citrix.com>
On Fri, Feb 23, 2024 at 10:35:50AM +0000, Andrew Cooper wrote: > Right now, there's a mixup over the xen/ part of the path for new files. > > + NEW_FILES=./arch/x86/lp-hooks.o > + for i in '$NEW_FILES' > ++ dirname ./arch/x86/lp-hooks.o > + mkdir -p output/./arch/x86 > + cp patched/./arch/x86/lp-hooks.o output/./arch/x86/lp-hooks.o > cp: cannot stat 'patched/./arch/x86/lp-hooks.o': No such file or directory > > Alter the `cd` and `find` runes to use paths relative to the root of the > different source trees. > > Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> Hm, this never worked AFAICT. Reviewed-by: Roger Pau Monné <roger.pau@citrix.com> Thanks, Roger.
diff --git a/livepatch-build b/livepatch-build index cdb852cc7fea..948b2acfc2f6 100755 --- a/livepatch-build +++ b/livepatch-build @@ -227,7 +227,7 @@ function create_patch() fi done - NEW_FILES=$(comm -23 <(cd patched/xen && find . -type f -name '*.o' | sort) <(cd original/xen && find . -type f -name '*.o' | sort)) + NEW_FILES=$(comm -23 <(cd patched && find xen/ -type f -name '*.o' | sort) <(cd original && find xen/ -type f -name '*.o' | sort)) for i in $NEW_FILES; do mkdir -p "output/$(dirname "$i")" cp "patched/$i" "output/$i"
Right now, there's a mixup over the xen/ part of the path for new files. + NEW_FILES=./arch/x86/lp-hooks.o + for i in '$NEW_FILES' ++ dirname ./arch/x86/lp-hooks.o + mkdir -p output/./arch/x86 + cp patched/./arch/x86/lp-hooks.o output/./arch/x86/lp-hooks.o cp: cannot stat 'patched/./arch/x86/lp-hooks.o': No such file or directory Alter the `cd` and `find` runes to use paths relative to the root of the different source trees. Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> --- CC: Roger Pau Monné <roger.pau@citrix.com> CC: Ross Lagerwall <ross.lagerwall@citrix.com> I'm unsure whether there's a useful fixes tag to use. AFAICT it was broken even when 0564f0c7a57 claimed to have it working. --- livepatch-build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: 1b5b03b3ce4187ce99bad580fd0ee36c6337313f