Changeset 45657


Ignore:
Timestamp:
2015-05-10T13:17:29+02:00 (3 years ago)
Author:
nbd
Message:

build: don't call prereq for any package/symlinks rules

Most of the time, we want to make sure OpenWrt has been configured and
setup before start running make. However, in case of package/symlinks,
forcing prereq as a dependency creates multiple issues:
*when executed on a clean workspace, it will prompt for user input

and open a menuconfig window before executing the feeds command

*the only way around that is to provide a .config. However, the "prereq"

target would then run a "make defconfig", which will remove all the
packages in the .config but from external feeds, as feeds have not been
installed yet.

The only way to currently work around this, is to generate a fake config
by running "make defconfig", then "make package/symlinks", copy the real
config (which at this point disregards the previously generated config),
and run make defconfig again. Something like this:

make defconfig
make package/symlinks
cp real.config .config
make defconfig

This change is removing the need for the first defconfig, making the
process more logical for OpenWrt users using the package/symlinks target.

Signed-off-by: Mathieu Olivari <mathieu@…>

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Makefile

    r45090 r45657  
    8787        $(_SINGLE)$(SUBMAKE) -r package/index 
    8888 
    89 # update all feeds, re-create index files, install symlinks 
    90 package/symlinks: 
    91         $(SCRIPT_DIR)/feeds update -a 
    92         $(SCRIPT_DIR)/feeds install -a 
    93  
    94 # re-create index files, install symlinks 
    95 package/symlinks-install: 
    96         $(SCRIPT_DIR)/feeds update -i 
    97         $(SCRIPT_DIR)/feeds install -a 
    98  
    99 # remove all symlinks, don't touch ./feeds 
    100 package/symlinks-clean: 
    101         $(SCRIPT_DIR)/feeds uninstall -a 
    102  
    10389.PHONY: clean dirclean prereq prepare world package/symlinks package/symlinks-install package/symlinks-clean 
    10490 
  • trunk/include/toplevel.mk

    r45457 r45657  
    194194endif 
    195195 
     196# update all feeds, re-create index files, install symlinks 
     197package/symlinks: 
     198        ./scripts/feeds update -a 
     199        ./scripts/feeds install -a 
     200 
     201# re-create index files, install symlinks 
     202package/symlinks-install: 
     203        ./scripts/feeds update -i 
     204        ./scripts/feeds install -a 
     205 
     206# remove all symlinks, don't touch ./feeds 
     207package/symlinks-clean: 
     208        ./scripts/feeds uninstall -a 
     209 
    196210help: 
    197211        cat README 
Note: See TracChangeset for help on using the changeset viewer.