| Message ID | 1496847092-18838-2-git-send-email-ian.jackson@eu.citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Jun 07, 2017 at 03:51:29PM +0100, Ian Jackson wrote: > Dumping these patch files in /usr/lib/debug/xen-*.livepatch is a bit > ugly. <shrugs> Not really tied in where they go. > > Also, refactor the Makefile to have a LIVEPATCHES variable, to reduce > repetition. > > CC: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> > Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com> > --- > xen/test/livepatch/Makefile | 19 +++++++++++-------- > 1 file changed, 11 insertions(+), 8 deletions(-) > > diff --git a/xen/test/livepatch/Makefile b/xen/test/livepatch/Makefile > index 76a779a..76d65cf 100644 > --- a/xen/test/livepatch/Makefile > +++ b/xen/test/livepatch/Makefile > @@ -20,18 +20,21 @@ LIVEPATCH_BYE := xen_bye_world.livepatch > LIVEPATCH_REPLACE := xen_replace_world.livepatch > LIVEPATCH_NOP := xen_nop.livepatch > > +LIVEPATCHES += $(LIVEPATCH) > +LIVEPATCHES += $(LIVEPATCH_BYE) > +LIVEPATCHES += $(LIVEPATCH_REPLACE) > +LIVEPATCHES += $(LIVEPATCH_NOP) > + > +LIVEPATCH_DEBUG_DIR ?= $(DEBUG_DIR)/xen-livepatch > + > default: livepatch > > install: livepatch > - $(INSTALL_DATA) $(LIVEPATCH) $(DESTDIR)$(DEBUG_DIR)/$(LIVEPATCH) > - $(INSTALL_DATA) $(LIVEPATCH_BYE) $(DESTDIR)$(DEBUG_DIR)/$(LIVEPATCH_BYE) > - $(INSTALL_DATA) $(LIVEPATCH_REPLACE) $(DESTDIR)$(DEBUG_DIR)/$(LIVEPATCH_REPLACE) > - $(INSTALL_DATA) $(LIVEPATCH_NOP) $(DESTDIR)$(DEBUG_DIR)/$(LIVEPATCH_NOP) > + $(INSTALL_DIR) $(DESTDIR)$(LIVEPATCH_DEBUG_DIR) > + $(INSTALL_DATA) $(LIVEPATCHES) $(DESTDIR)$(LIVEPATCH_DEBUG_DIR) > + > uninstall: > - rm -f $(DESTDIR)$(DEBUG_DIR)/$(LIVEPATCH) > - rm -f $(DESTDIR)$(DEBUG_DIR)/$(LIVEPATCH_BYE) > - rm -f $(DESTDIR)$(DEBUG_DIR)/$(LIVEPATCH_REPLACE) > - rm -f $(DESTDIR)$(DEBUG_DIR)/$(LIVEPATCH_NOP) > + cd $(DESTDIR)$(LIVEPATCH_DEBUG_DIR) && rm -f $(LIVEPATCHES) > > .PHONY: clean > clean:: > -- > 2.1.4 >
diff --git a/xen/test/livepatch/Makefile b/xen/test/livepatch/Makefile index 76a779a..76d65cf 100644 --- a/xen/test/livepatch/Makefile +++ b/xen/test/livepatch/Makefile @@ -20,18 +20,21 @@ LIVEPATCH_BYE := xen_bye_world.livepatch LIVEPATCH_REPLACE := xen_replace_world.livepatch LIVEPATCH_NOP := xen_nop.livepatch +LIVEPATCHES += $(LIVEPATCH) +LIVEPATCHES += $(LIVEPATCH_BYE) +LIVEPATCHES += $(LIVEPATCH_REPLACE) +LIVEPATCHES += $(LIVEPATCH_NOP) + +LIVEPATCH_DEBUG_DIR ?= $(DEBUG_DIR)/xen-livepatch + default: livepatch install: livepatch - $(INSTALL_DATA) $(LIVEPATCH) $(DESTDIR)$(DEBUG_DIR)/$(LIVEPATCH) - $(INSTALL_DATA) $(LIVEPATCH_BYE) $(DESTDIR)$(DEBUG_DIR)/$(LIVEPATCH_BYE) - $(INSTALL_DATA) $(LIVEPATCH_REPLACE) $(DESTDIR)$(DEBUG_DIR)/$(LIVEPATCH_REPLACE) - $(INSTALL_DATA) $(LIVEPATCH_NOP) $(DESTDIR)$(DEBUG_DIR)/$(LIVEPATCH_NOP) + $(INSTALL_DIR) $(DESTDIR)$(LIVEPATCH_DEBUG_DIR) + $(INSTALL_DATA) $(LIVEPATCHES) $(DESTDIR)$(LIVEPATCH_DEBUG_DIR) + uninstall: - rm -f $(DESTDIR)$(DEBUG_DIR)/$(LIVEPATCH) - rm -f $(DESTDIR)$(DEBUG_DIR)/$(LIVEPATCH_BYE) - rm -f $(DESTDIR)$(DEBUG_DIR)/$(LIVEPATCH_REPLACE) - rm -f $(DESTDIR)$(DEBUG_DIR)/$(LIVEPATCH_NOP) + cd $(DESTDIR)$(LIVEPATCH_DEBUG_DIR) && rm -f $(LIVEPATCHES) .PHONY: clean clean::
Dumping these patch files in /usr/lib/debug/xen-*.livepatch is a bit ugly. Also, refactor the Makefile to have a LIVEPATCHES variable, to reduce repetition. CC: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com> --- xen/test/livepatch/Makefile | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)