KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

move "make symlinks" to "make package/symlinks"

Browse source 
SVN-Revision: 6234
This commit is contained in:
Mike Baker 2007-01-31 18:33:04 +00:00
parent f206cee9db
commit 7656ad75e5
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Makefile
View file

@ -187,9 +187,6 @@ doc:
docclean: docclean:
$(MAKE) -C docs/ clean $(MAKE) -C docs/ clean
symlinks:
scripts/feeds.sh $(CONFIG_SOURCE_FEEDS)
.SILENT: clean dirclean distclean config-clean download world .SILENT: clean dirclean distclean config-clean download world
FORCE: ; FORCE: ;
.PHONY: FORCE help .PHONY: FORCE help

2
package/Makefile
View file

@ -73,6 +73,8 @@ index: $(PACKAGE_DIR)/Packages
$(PACKAGE_DIR)/Packages: $(PACKAGE_DIR)/*.ipk $(PACKAGE_DIR)/Packages: $(PACKAGE_DIR)/*.ipk
(cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . > Packages) (cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . > Packages)
symlinks:
../scripts/feeds.sh $(CONFIG_SOURCE_FEEDS)
ifeq ($(MAKECMDGOALS),compile-targets) ifeq ($(MAKECMDGOALS),compile-targets)
MAKEFLAGS:=$(MAKEFLAGS) -j$(CONFIG_JLEVEL) MAKEFLAGS:=$(MAKEFLAGS) -j$(CONFIG_JLEVEL)

8
scripts/feeds.sh
View file

@ -28,16 +28,16 @@ delete_symlinks() {
setup_symlinks() { setup_symlinks() {
# We assume that feeds do reproduce the hierarchy : section/package # We assume that feeds do reproduce the hierarchy : section/package
# so that we can make this structure be flat in $PACKAGE_DIR # so that we can make this structure be flat in $PACKAGE_DIR
for dir in $(ls $2/) for dir in $(ls $1/)
do do
ln -s $2/$dir/*/* $1/ ln -s $1/$dir/*/* $2/
done done
} }
checkout_feed() { checkout_feed() {
# We ensure the feed has not already been checked out, if so, we just update the source feed # We ensure the feed has not already been checked out, if so, we just update the source feed
if [ -d $FEEDS_DIR/$2 ]; then if [ -d $FEEDS_DIR/$2 ]; then
svn update $FEEDS_DIR/$2 svn up $FEEDS_DIR/$2
echo "Updated to revision $(LANG=C svn info $FEEDS_DIR/$2 | awk '/^Revision:/ { print $2 }' )"; echo "Updated to revision $(LANG=C svn info $FEEDS_DIR/$2 | awk '/^Revision:/ { print $2 }' )";
# Otherwise, we have to checkout in the $FEEDS_DIR # Otherwise, we have to checkout in the $FEEDS_DIR
else else
@ -48,7 +48,7 @@ checkout_feed() {
extract_feed_name() { extract_feed_name() {
# We extract the last name of the URL, maybe we should rename this as domain.tld.repository.name # We extract the last name of the URL, maybe we should rename this as domain.tld.repository.name
echo "$(echo $1 | awk -F/ '{ print $NF}')" echo "$(echo $1 | sed -e "s/[^A-Za-z\.]\+/_/g")"
} }
# We can delete symlinks every time we start this script, since modifications have been made in the $FEEDS_DIR anyway # We can delete symlinks every time we start this script, since modifications have been made in the $FEEDS_DIR anyway