Changeset 185


Ignore:
Timestamp:
Mar 25, 2011, 10:10:26 PM (9 years ago)
Author:
stappers
Message:

White space change: line breaks in our openwrt makefiles

From Linux CodingStyle?

The limit on the length of lines is 80 columns and this is a strongly
preferred limit.

Location:
debwrt/trunk/openwrt
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • debwrt/trunk/openwrt/openwrt-deliver.mk

    r153 r185  
    1919# save in a special config file during OpenWrt's build process
    2020#
    21 # OPENWRT_BIN_DIR               - directory where OpenWrt firmware is stored
    22 # OPENWRT_PACKAGE_DIR   - directory where OpenWrt packages are stored
    23 # OPENWRT_TMP_DIR               - directory where OpenWrt stored all kernel modules
     21# OPENWRT_BIN_DIR       - directory where OpenWrt firmware is stored
     22# OPENWRT_PACKAGE_DIR   - directory where OpenWrt packages are stored
     23# OPENWRT_TMP_DIR       - directory where OpenWrt stored all kernel modules
    2424# OPENWRT_LINUX_VERSION - kernel version of the kernel build by OpenWrt
    2525# OPENWRT_LINUX_DIR     - OpenWrt's kernel build directory
     
    2929ERROR_MSG_NOCONF:=" not defined. Make sure OpenWrt build finished."
    3030
    31 openwrt/deliver: openwrt/deliver/prepare        openwrt/deliver/clean                   \
    32                                  openwrt/deliver/image          openwrt/deliver/kernel-modules  \
    33                                  openwrt/deliver/packages       openwrt/deliver/config              \
    34                                  openwrt/deliver/kernel-headers
     31openwrt/deliver: \
     32  openwrt/deliver/prepare \
     33  openwrt/deliver/clean \
     34  openwrt/deliver/image \
     35  openwrt/deliver/kernel-modules \
     36  openwrt/deliver/packages \
     37  openwrt/deliver/config\
     38  openwrt/deliver/kernel-headers \
     39  # end openwrt/deliver:
    3540
    3641openwrt/deliver/prepare: openwrt/deliver/import-config openwrt/deliver/check
  • debwrt/trunk/openwrt/openwrt.mk

    r176 r185  
    3838        touch $@
    3939
    40 openwrt/prepare: openwrt/checkout openwrt/patch openwrt/merge-config openwrt/download-link
     40openwrt/prepare: \
     41  openwrt/checkout \
     42  openwrt/patch \
     43  openwrt/merge-config \
     44  openwrt/download-link \
     45  # end openwrt/prepare:
    4146        touch $@
    4247
    43 openwrt/merge-config: .config $(OPENWRT_BUILD_DIR)/.config openwrt/checkout openwrt/patch
     48openwrt/stappersdebug:
     49        echo $(OPENWRT_BUILD_DIR)/.config
     50
     51openwrt/merge-config: \
     52  .config \
     53  $(OPENWRT_BUILD_DIR)/.config \
     54  openwrt/checkout openwrt/patch \
     55  # end openwrt/merge-config:
    4456        mkdir -p $(TMP_DIR)
    4557        @# Copy default OpenWrt settings
    4658        cp $(CONFIG_DIR)/openwrt.defconfig $(TMP_DIR)/.config_openwrt
    4759        @# Merge default OpenWrt settings with menu settings
    48         cat .config | grep -v -e CONFIG_TARGET_BOARD -e "^#" >> $(TMP_DIR)/.config_openwrt
    49         @# Merge default and menu settings with possibly altered settings in make menuconfig in OpenWrt
     60        cat .config | grep -v -e CONFIG_TARGET_BOARD -e "^#" \
     61          >> $(TMP_DIR)/.config_openwrt
     62        @# Merge default and menu settings
     63        @#  with possibly altered settings in make menuconfig in OpenWrt
    5064        touch $(OPENWRT_BUILD_DIR)/.config
    5165        cp $(OPENWRT_BUILD_DIR)/.config $(OPENWRT_BUILD_DIR)/.config.org
    52         @$(SCRIPT_KCONFIG) + $(OPENWRT_BUILD_DIR)/.config.org $(TMP_DIR)/.config_openwrt > $(OPENWRT_BUILD_DIR)/.config
     66        @$(SCRIPT_KCONFIG) + $(OPENWRT_BUILD_DIR)/.config.org \
     67          $(TMP_DIR)/.config_openwrt > $(OPENWRT_BUILD_DIR)/.config
    5368        @# Make sure the config is clean
    5469        $(SCRIPT_CLEAN_EXEC) $(MAKE) -C $(OPENWRT_BUILD_DIR) defconfig
    55         @# Copy DebWrt config to the build dir - used to set kernel compile options
     70        @# Copy DebWrt config to the build dir 
     71        @#  used to set kernel compile options
    5672        cp .config $(OPENWRT_BUILD_DIR)/.config.debwrt
    5773        touch $@
     
    6783
    6884openwrt/patch: openwrt/checkout
    69         patch -d $(OPENWRT_BUILD_DIR) -p 0 -N < $(PATCHES_DIR_OPENWRT)/001_disable_all_openwrt_packages
     85        patch -d $(OPENWRT_BUILD_DIR) -p 0 -N \
     86          < $(PATCHES_DIR_OPENWRT)/001_disable_all_openwrt_packages
    7087ifeq ($(IS_OPENWRT_TRUNK),y)
    71         patch -d $(OPENWRT_BUILD_DIR) -p 0 -N < $(PATCHES_DIR_OPENWRT)/trunk/002_install_kernel_modules_and_merge_debwrt_config
    72         patch -d $(OPENWRT_BUILD_DIR) -p 0 -N < $(PATCHES_DIR_OPENWRT)/trunk/005_make_empty_rootfs
     88        patch -d $(OPENWRT_BUILD_DIR) -p 0 -N \
     89          < $(PATCHES_DIR_OPENWRT)/trunk/002_install_kernel_modules_and_merge_debwrt_config
     90        patch -d $(OPENWRT_BUILD_DIR) -p 0 -N \
     91          < $(PATCHES_DIR_OPENWRT)/trunk/005_make_empty_rootfs
    7392else ifeq ($(IS_OPENWRT_BACKFIRE),y)
    74         patch -d $(OPENWRT_BUILD_DIR) -p 0 -N < $(PATCHES_DIR_OPENWRT)/backfire/002_install_kernel_modules_and_merge_debwrt_config
    75         patch -d $(OPENWRT_BUILD_DIR) -p 0 -N < $(PATCHES_DIR_OPENWRT)/backfire/005_make_empty_rootfs
     93        patch -d $(OPENWRT_BUILD_DIR) -p 0 -N \
     94          < $(PATCHES_DIR_OPENWRT)/backfire/002_install_kernel_modules_and_merge_debwrt_config
     95        patch -d $(OPENWRT_BUILD_DIR) -p 0 -N \
     96          < $(PATCHES_DIR_OPENWRT)/backfire/005_make_empty_rootfs
    7697endif
    77         #patch -d $(OPENWRT_BUILD_DIR) -p 0 -N < $(PATCHES_DIR_OPENWRT)/003_set_kernel_version
    78         patch -d $(OPENWRT_BUILD_DIR) -p 0 -N < $(PATCHES_DIR_OPENWRT)/004_save_environment_variables
     98        #patch -d $(OPENWRT_BUILD_DIR) -p 0 -N \
     99          < $(PATCHES_DIR_OPENWRT)/003_set_kernel_version
     100        patch -d $(OPENWRT_BUILD_DIR) -p 0 -N \
     101          < $(PATCHES_DIR_OPENWRT)/004_save_environment_variables
    79102        touch $@
    80103
     
    83106        mkdir -p $(OPENWRT_BUILD_DIR)
    84107ifeq ($(IS_OPENWRT_TRUNK),y)
    85         cd $(OPENWRT_BUILD_DIR) && svn co svn://svn.openwrt.org/openwrt/trunk/ .
     108        cd $(OPENWRT_BUILD_DIR) && \
     109          svn co svn://svn.openwrt.org/openwrt/trunk/ .
    86110else ifeq ($(IS_OPENWRT_BACKFIRE),y)
    87         cd $(OPENWRT_BUILD_DIR) && svn co svn://svn.openwrt.org/openwrt/branches/backfire/ .
     111        cd $(OPENWRT_BUILD_DIR) && \
     112          svn co svn://svn.openwrt.org/openwrt/branches/backfire/ .
    88113else
    89         cd $(OPENWRT_BUILD_DIR) && svn co -r $(OPENWRT_REVISION) svn://svn.openwrt.org/openwrt/trunk/ .
     114        cd $(OPENWRT_BUILD_DIR) && \
     115          svn co -r $(OPENWRT_REVISION) svn://svn.openwrt.org/openwrt/trunk/ .
    90116endif
    91117        touch $@
     
    93119openwrt/update: openwrt/checkout
    94120ifeq ($(IS_OPENWRT_TRUNK),y)
    95         cd $(OPENWRT_BUILD_DIR) && svn update svn://svn.openwrt.org/openwrt/trunk/ .
     121        cd $(OPENWRT_BUILD_DIR) && \
     122          svn update svn://svn.openwrt.org/openwrt/trunk/ .
    96123else ifeq ($(IS_OPENWRT_BACKFIRE),y)
    97         cd $(OPENWRT_BUILD_DIR) && svn update svn://svn.openwrt.org/openwrt/branches/backfire/ .
     124        cd $(OPENWRT_BUILD_DIR) && \
     125          svn update svn://svn.openwrt.org/openwrt/branches/backfire/ .
    98126else
    99         cd $(OPENWRT_BUILD_DIR) && svn update -r $(OPENWRT_REVISION) svn://svn.openwrt.org/openwrt/trunk/ .
     127        cd $(OPENWRT_BUILD_DIR) && \
     128          svn update -r $(OPENWRT_REVISION) svn://svn.openwrt.org/openwrt/trunk/ .
    100129endif
    101130
Note: See TracChangeset for help on using the changeset viewer.