| Message ID | 20191212182740.2190199-2-anthony.perard@citrix.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | xen: Kconfig update with few extra | expand |
On 12/12/2019 18:27, Anthony PERARD wrote: > And remove all mention of it in docs. It hasn't been used since > 9ead9afcb935 ("Add configure --with-sysconfig-leaf-dir=SUBDIR to set > CONFIG_LEAF_DIR"). > > Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> Acked-by: Andrew Cooper <andrew.cooper3@citrix.com> > --- > Config.mk | 11 ----------- > docs/misc/distro_mapping.txt | 5 ++--- > 2 files changed, 2 insertions(+), 14 deletions(-) > > diff --git a/Config.mk b/Config.mk > index 54e4b7091bfc..8768398d5ece 100644 > --- a/Config.mk > +++ b/Config.mk > @@ -68,17 +68,6 @@ DEPS_RM = $(DEPS) $(DEPS_INCLUDE) > include $(XEN_ROOT)/config/$(XEN_OS).mk > include $(XEN_ROOT)/config/$(XEN_TARGET_ARCH).mk > > -# arguments: variable, common path part, path to test, if yes, if no > -define setvar_dir > - ifndef $(1) > - ifneq (,$(wildcard $(2)$(3))) > - $(1) ?= $(2)$(4) > - else > - $(1) ?= $(2)$(5) > - endif > - endif > -endef > - > ifneq ($(EXTRA_PREFIX),) > EXTRA_INCLUDES += $(EXTRA_PREFIX)/include > EXTRA_LIB += $(EXTRA_PREFIX)/lib > diff --git a/docs/misc/distro_mapping.txt b/docs/misc/distro_mapping.txt > index 2e46592728e3..599b6fd1e912 100644 > --- a/docs/misc/distro_mapping.txt > +++ b/docs/misc/distro_mapping.txt It looks like this is entirely obsolete since we switched to using ./configure. Mind if we expand the patch to kill this file fully? (Can be sorted on commit if you want.) ~Andrew
On Thu, Dec 12, 2019 at 06:30:43PM +0000, Andrew Cooper wrote: > On 12/12/2019 18:27, Anthony PERARD wrote: > > diff --git a/docs/misc/distro_mapping.txt b/docs/misc/distro_mapping.txt > > index 2e46592728e3..599b6fd1e912 100644 > > --- a/docs/misc/distro_mapping.txt > > +++ b/docs/misc/distro_mapping.txt > > It looks like this is entirely obsolete since we switched to using > ./configure. > > Mind if we expand the patch to kill this file fully? (Can be sorted on > commit if you want.) I think it would be better to remove the file in a separated commit, with a proper explanation. Probably about half of the file is still true, I'm not sure about the other half. That document might not be relevant anymore, since hopefully ./configure --help is enough, but I haven't checked. Thanks,
diff --git a/Config.mk b/Config.mk index 54e4b7091bfc..8768398d5ece 100644 --- a/Config.mk +++ b/Config.mk @@ -68,17 +68,6 @@ DEPS_RM = $(DEPS) $(DEPS_INCLUDE) include $(XEN_ROOT)/config/$(XEN_OS).mk include $(XEN_ROOT)/config/$(XEN_TARGET_ARCH).mk -# arguments: variable, common path part, path to test, if yes, if no -define setvar_dir - ifndef $(1) - ifneq (,$(wildcard $(2)$(3))) - $(1) ?= $(2)$(4) - else - $(1) ?= $(2)$(5) - endif - endif -endef - ifneq ($(EXTRA_PREFIX),) EXTRA_INCLUDES += $(EXTRA_PREFIX)/include EXTRA_LIB += $(EXTRA_PREFIX)/lib diff --git a/docs/misc/distro_mapping.txt b/docs/misc/distro_mapping.txt index 2e46592728e3..599b6fd1e912 100644 --- a/docs/misc/distro_mapping.txt +++ b/docs/misc/distro_mapping.txt @@ -9,9 +9,8 @@ INITD_DIR | /etc/rc.d/init.d | /etc/init.d | /etc/init.d | -----------------+------------------+---------------+----------------+ The existence of these directories are tested at build-time (on the -build host, via the "setvar_dir" macro in Config.mk) and for some -scripts at run-time. If the Red Hat directory exists, it is used; -otherwise the Debian one is used. +build host) and for some scripts at run-time. If the Red Hat +directory exists, it is used; otherwise the Debian one is used. The INITD_DIR path can be changed with configure --with-initddir=DIR. The CONFIG_LEAF_DIR name can be changed with configure
And remove all mention of it in docs. It hasn't been used since 9ead9afcb935 ("Add configure --with-sysconfig-leaf-dir=SUBDIR to set CONFIG_LEAF_DIR"). Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> --- Config.mk | 11 ----------- docs/misc/distro_mapping.txt | 5 ++--- 2 files changed, 2 insertions(+), 14 deletions(-)