From 1b4e784a0ba636646def1db5ca012fd54ee7a81c Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Tue, 6 Jun 2017 20:06:04 -0700 Subject: Fix debuild warnings/errors - Update .gitignore, do not place .gitignore into directories installed in bulk - Remove executable permissions and shebangs from the scripts that are supposed to be invoked only via ct-ng frontent; prepend them with $(bash). Despite what showSamples.sh said, it already has some bashisms. - Remove --with autotools-dev and override dh_update_autotools_config to avoid having config.{sub,guess} clobbered with older versions - Install bash completion where Debian (now) expects it - Update man page to use .\" as the comment delimiter, instead of undefined macro (."); also, minor text edits. - Install kconfig.mk without execute permission. - Remove shell wrappers from 170-localedef-fix-trampoline.patch, we do not use that for applying patches - Revoke execute permissions on 210-expat.sh - Get flags from dpkg-buildflags if available Signed-off-by: Alexey Neyman --- samples/samples.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'samples') diff --git a/samples/samples.mk b/samples/samples.mk index ce7e7c98..ecd8a158 100644 --- a/samples/samples.mk +++ b/samples/samples.mk @@ -43,7 +43,7 @@ help-env:: PHONY += show-config show-config: .config @cp .config .config.sample - @$(CT_LIB_DIR)/scripts/showSamples.sh -v current + @$(bash) $(CT_LIB_DIR)/scripts/showSamples.sh -v current @rm -f .config.sample # Prints the details of a sample @@ -52,7 +52,7 @@ $(patsubst %,show-%,$(CT_SAMPLES)): show-%: @KCONFIG_CONFIG=$$(pwd)/.config.sample \ $(CONF) --defconfig=$(call sample_dir,$*)/crosstool.config \ $(KCONFIG_TOP) >/dev/null - @$(CT_LIB_DIR)/scripts/showSamples.sh -v $* + @$(bash) $(CT_LIB_DIR)/scripts/showSamples.sh -v $* @rm -f .config.sample # Prints the details of all samples @@ -76,7 +76,7 @@ $(patsubst %,list-%,$(CT_SAMPLES)): list-%: @KCONFIG_CONFIG=$$(pwd)/.config.sample \ $(CONF) --defconfig=$(call sample_dir,$*)/crosstool.config \ $(KCONFIG_TOP) >/dev/null - @$(CT_LIB_DIR)/scripts/showSamples.sh $* + @$(bash) $(CT_LIB_DIR)/scripts/showSamples.sh $* @rm -f .config.sample PHONY += list-samples-short @@ -114,16 +114,16 @@ PHONY += wiki-samples wiki-samples: wiki-samples-pre $(patsubst %,wiki-%,$(CT_SAMPLES)) wiki-samples-post wiki-samples-pre: FORCE - $(SILENT)$(CT_LIB_DIR)/scripts/showSamples.sh -w + $(SILENT)$(bash) $(CT_LIB_DIR)/scripts/showSamples.sh -w wiki-samples-post: FORCE - $(SILENT)$(CT_LIB_DIR)/scripts/showSamples.sh -W $(CT_SAMPLES) + $(SILENT)$(bash) $(CT_LIB_DIR)/scripts/showSamples.sh -W $(CT_SAMPLES) $(patsubst %,wiki-%,$(CT_SAMPLES)): wiki-%: $(SILENT)KCONFIG_CONFIG=$$(pwd)/.config.sample \ $(CONF) --defconfig=$(call sample_dir,$*)/crosstool.config \ $(KCONFIG_TOP) >/dev/null - $(SILENT)$(CT_LIB_DIR)/scripts/showSamples.sh -w $* + $(SILENT)$(bash) $(CT_LIB_DIR)/scripts/showSamples.sh -w $* $(SILENT)rm -f .config.sample # ---------------------------------------------------------- @@ -136,7 +136,7 @@ samples: # Save a sample saveconfig: .config samples - $(SILENT)$(CT_LIB_DIR)/scripts/saveSample.sh + $(SILENT)$(bash) $(CT_LIB_DIR)/scripts/saveSample.sh # The 'sample_dir' function prints the directory in which the sample is, # searching first in local samples, then in global samples -- cgit v1.2.3