From 1be278b34d906eb1418722007e3633e5e95401b5 Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Fri, 4 May 2012 15:35:27 -0700 Subject: compat-wirless: prefix release files with dot This prefixes these files with a dot: compat_base_tree --> .compat_base_tree compat_base_tree_version --> .compat_base_tree_version compat_version --> .compat_version Signed-off-by: Luis R. Rodriguez --- .gitignore | 6 +++--- Makefile | 8 ++++---- enable-older-kernels/enable-2.6.21.patch | 4 ++-- enable-older-kernels/enable-2.6.22.patch | 4 ++-- enable-older-kernels/enable-2.6.23.patch | 4 ++-- scripts/admin-clean.sh | 6 +++--- scripts/admin-update.sh | 18 +++++++++--------- scripts/driver-select | 2 +- scripts/gen-compat-autoconf.sh | 4 ++-- scripts/refresh-compat | 16 ++++++++-------- 10 files changed, 36 insertions(+), 36 deletions(-) diff --git a/.gitignore b/.gitignore index 3e93d895..b615253b 100644 --- a/.gitignore +++ b/.gitignore @@ -11,9 +11,9 @@ Module.symvers module.order .pc code-metrics.txt -compat_base_tree -compat_base_tree_version -compat_version +.compat_base_tree +.compat_base_tree_version +.compat_version .compat_autoconf_compat-* .config .config.mk_md5sum.txt diff --git a/Makefile b/Makefile index f2adff25..49cbb59e 100644 --- a/Makefile +++ b/Makefile @@ -55,10 +55,10 @@ $(error "The path to this compat-wireless directory has spaces in it." \ endif export CFLAGS += \ - -DCOMPAT_BASE_TREE="\"$(shell cat $(PWD)/compat_base_tree)\"" \ - -DCOMPAT_BASE_TREE_VERSION="\"$(shell cat $(PWD)/compat_base_tree_version)\"" \ + -DCOMPAT_BASE_TREE="\"$(shell cat $(PWD)/.compat_base_tree)\"" \ + -DCOMPAT_BASE_TREE_VERSION="\"$(shell cat $(PWD)/.compat_base_tree_version)\"" \ -DCOMPAT_PROJECT="\"Compat-wireless\"" \ - -DCOMPAT_VERSION="\"$(shell cat $(PWD)/compat_version)\"" + -DCOMPAT_VERSION="\"$(shell cat $(PWD)/.compat_version)\"" # These exported as they are used by the scripts # to check config and compat autoconf @@ -66,7 +66,7 @@ export COMPAT_CONFIG_CW=$(PWD)/config.mk export COMPAT_CONFIG=$(PWD)/.config export CONFIG_CHECK=$(PWD)/.config.mk_md5sum.txt export COMPAT_AUTOCONF=include/linux/compat_autoconf.h -export CREL=$(shell cat $(PWD)/compat_version) +export CREL=$(shell cat $(PWD)/.compat_version) export CREL_PRE:=.compat_autoconf_ export CREL_CHECK:=$(PWD)/$(CREL_PRE)$(CREL) diff --git a/enable-older-kernels/enable-2.6.21.patch b/enable-older-kernels/enable-2.6.21.patch index 44a1bb25..593d9ddd 100644 --- a/enable-older-kernels/enable-2.6.21.patch +++ b/enable-older-kernels/enable-2.6.21.patch @@ -21,6 +21,6 @@ # Update this if you are adding support for older kernels. -OLDEST_KERNEL_SUPPORTED="2.6.24" +OLDEST_KERNEL_SUPPORTED="2.6.21" - COMPAT_RELEASE="compat_version" - KERNEL_RELEASE="compat_base_tree_version" + COMPAT_RELEASE=".compat_version" + KERNEL_RELEASE=".compat_base_tree_version" MULT_DEP_FILE=".compat_pivot_dep" diff --git a/enable-older-kernels/enable-2.6.22.patch b/enable-older-kernels/enable-2.6.22.patch index 12738249..86b35d60 100644 --- a/enable-older-kernels/enable-2.6.22.patch +++ b/enable-older-kernels/enable-2.6.22.patch @@ -21,6 +21,6 @@ # Update this if you are adding support for older kernels. -OLDEST_KERNEL_SUPPORTED="2.6.24" +OLDEST_KERNEL_SUPPORTED="2.6.22" - COMPAT_RELEASE="compat_version" - KERNEL_RELEASE="compat_base_tree_version" + COMPAT_RELEASE=".compat_version" + KERNEL_RELEASE=".compat_base_tree_version" MULT_DEP_FILE=".compat_pivot_dep" diff --git a/enable-older-kernels/enable-2.6.23.patch b/enable-older-kernels/enable-2.6.23.patch index 7a958428..82ba243f 100644 --- a/enable-older-kernels/enable-2.6.23.patch +++ b/enable-older-kernels/enable-2.6.23.patch @@ -21,6 +21,6 @@ # Update this if you are adding support for older kernels. -OLDEST_KERNEL_SUPPORTED="2.6.24" +OLDEST_KERNEL_SUPPORTED="2.6.23" - COMPAT_RELEASE="compat_version" - KERNEL_RELEASE="compat_base_tree_version" + COMPAT_RELEASE=".compat_version" + KERNEL_RELEASE=".compat_base_tree_version" MULT_DEP_FILE=".compat_pivot_dep" diff --git a/scripts/admin-clean.sh b/scripts/admin-clean.sh index 81398f2a..4f8c4d1d 100755 --- a/scripts/admin-clean.sh +++ b/scripts/admin-clean.sh @@ -8,8 +8,8 @@ rm -rf include rm -rf compat rm -rf udev rm -f master-tag -rm -f compat_base_tree -rm -f compat_base_tree_version -rm -f compat_version +rm -f .compat_base_tree +rm -f .compat_base_tree_version +rm -f .compat_version rm -f code-metrics.txt echo "Cleaned wireless-bt-compat-2.6" diff --git a/scripts/admin-update.sh b/scripts/admin-update.sh index fd1fa878..362f9c4e 100755 --- a/scripts/admin-update.sh +++ b/scripts/admin-update.sh @@ -602,25 +602,25 @@ echo -e "Origin remote URL: ${CYAN}${GIT_REMOTE_URL}${NORMAL}" cd $DIR if [ -d ./.git ]; then if [[ ${POSTFIX_RELEASE_TAG} != "" ]]; then - echo -e "$(git describe)-${POSTFIX_RELEASE_TAG}" > compat_version + echo -e "$(git describe)-${POSTFIX_RELEASE_TAG}" > .compat_version else - echo -e "$(git describe)" > compat_version + echo -e "$(git describe)" > .compat_version fi cd $GIT_TREE TREE_NAME=${GIT_REMOTE_URL##*/} - echo $TREE_NAME > $DIR/compat_base_tree - echo $GIT_DESCRIBE > $DIR/compat_base_tree_version + echo $TREE_NAME > $DIR/.compat_base_tree + echo $GIT_DESCRIBE > $DIR/.compat_base_tree_version case $TREE_NAME in "wireless-testing.git") # John's wireless-testing - # We override the compat_base_tree_version for wireless-testing + # We override the .compat_base_tree_version for wireless-testing # as john keeps the Linus' tags and does not write a tag for his # tree himself so git describe would yield a v2.6.3x.y-etc but # what is more useful is just the wireless-testing master tag MASTER_TAG=$(git tag -l| grep master | tail -1) - echo $MASTER_TAG > $DIR/compat_base_tree_version + echo $MASTER_TAG > $DIR/.compat_base_tree_version echo -e "This is a ${RED}wireless-testing.git${NORMAL} compat-wireless release" ;; "linux-next.git") # The linux-next integration testing tree @@ -639,9 +639,9 @@ if [ -d ./.git ]; then esac cd $DIR - echo -e "\nBase tree: ${GREEN}$(cat compat_base_tree)${NORMAL}" >> $CODE_METRICS - echo -e "Base tree version: ${PURPLE}$(cat compat_base_tree_version)${NORMAL}" >> $CODE_METRICS - echo -e "compat-wireless release: ${YELLOW}$(cat compat_version)${NORMAL}" >> $CODE_METRICS + echo -e "\nBase tree: ${GREEN}$(cat .compat_base_tree)${NORMAL}" >> $CODE_METRICS + echo -e "Base tree version: ${PURPLE}$(cat .compat_base_tree_version)${NORMAL}" >> $CODE_METRICS + echo -e "compat-wireless release: ${YELLOW}$(cat .compat_version)${NORMAL}" >> $CODE_METRICS fi diff --git a/scripts/driver-select b/scripts/driver-select index c8aff636..3d164679 100755 --- a/scripts/driver-select +++ b/scripts/driver-select @@ -278,7 +278,7 @@ if [ $# -ne 1 ]; then exit fi -if [ ! -f compat_version ]; then +if [ ! -f .compat_version ]; then echo "Must run $0 from the compat-wireless top level directory" exit fi diff --git a/scripts/gen-compat-autoconf.sh b/scripts/gen-compat-autoconf.sh index c7bdd38d..1b82184e 100755 --- a/scripts/gen-compat-autoconf.sh +++ b/scripts/gen-compat-autoconf.sh @@ -12,8 +12,8 @@ # This indicates which is the oldest kernel we support # Update this if you are adding support for older kernels. OLDEST_KERNEL_SUPPORTED="2.6.24" -COMPAT_RELEASE="compat_version" -KERNEL_RELEASE="compat_base_tree_version" +COMPAT_RELEASE=".compat_version" +KERNEL_RELEASE=".compat_base_tree_version" MULT_DEP_FILE=".compat_pivot_dep" if [ $# -ne 2 ]; then diff --git a/scripts/refresh-compat b/scripts/refresh-compat index d4c44c87..2f00282b 100755 --- a/scripts/refresh-compat +++ b/scripts/refresh-compat @@ -11,9 +11,9 @@ # udev/ # include/ # scripts/ -# compat_base_tree -# compat_base_tree_version -# compat_version +# .compat_base_tree +# .compat_base_tree_version +# .compat_version # config.mk # # An example git tree for standalone development will be provided later. @@ -52,9 +52,9 @@ COPY="$COPY scripts/compress_modules" COPY="$COPY scripts/gen-compat-autoconf.sh" COPY="$COPY scripts/modlib.sh" COPY="$COPY scripts/update-initramfs" -COPY="$COPY compat_base_tree" -COPY="$COPY compat_base_tree_version" -COPY="$COPY compat_version" +COPY="$COPY .compat_base_tree" +COPY="$COPY .compat_base_tree_version" +COPY="$COPY .compat_version" COPY="$COPY config.mk" COPY="$COPY $EXTRA_COPY" @@ -89,10 +89,10 @@ rm -f .config cp -f ${COMPAT_SRC}/${REFRESH_LOCAL} ${REFRESH_TARGET} -if [[ ! -f compat_base_tree_version ]]; then +if [[ ! -f .compat_base_tree_version ]]; then echo -e "Failed at copying files over..." exit 1 fi echo -echo -e "Synched with ${CYAN}$(cat compat_version)${NORMAL}" +echo -e "Synched with ${CYAN}$(cat .compat_version)${NORMAL}" -- cgit v1.2.3