qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-24 02:48:26 +02:00
Code

remove DIST and add EXTRAVERSION, discussed with mbm. fixed dirclean target for linksys-stuff

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@279 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
wbx 2005-02-21 06:03:54 +00:00
parent f8d2c2cd65
commit 82138f740a
4 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -128,11 +128,11 @@ source: $(TARGETS_SOURCE)
############################################################# #############################################################
clean: clean:
rm -rf $(TARGET_DIR) $(IMAGE).* rm -rf $(TARGET_DIR) $(IMAGE).*
$(MAKE) $(DIST)-image-clean $(MAKE) openwrt-image-clean
dirclean: $(TARGETS_DIRCLEAN) dirclean: $(TARGETS_DIRCLEAN)
rm -rf $(TARGET_DIR) $(IMAGE).* rm -rf $(TARGET_DIR) $(IMAGE).*
$(MAKE) $(DIST)-image-clean $(MAKE) openwrt-image-dirclean
distclean: clean distclean: clean
rm -rf $(DL_DIR) $(BUILD_DIR) $(TOOL_BUILD_DIR) rm -rf $(DL_DIR) $(BUILD_DIR) $(TOOL_BUILD_DIR)

1
package/config/mconf.c
View File

@ -705,6 +705,7 @@ int main(int ac, char **av)
conf_write(NULL); conf_write(NULL);
printf("\n\n" printf("\n\n"
"*** End of Buildroot configuration.\n" "*** End of Buildroot configuration.\n"
"*** After changing root fs, use make linux-dirclean.\n"
"*** Check the top-level Makefile for additional configuration options.\n\n"); "*** Check the top-level Makefile for additional configuration options.\n\n");
} else } else
printf("\n\nYour Buildroot configuration changes were NOT saved.\n\n"); printf("\n\nYour Buildroot configuration changes were NOT saved.\n\n");

10
package/openwrt/openwrt.mk
View File

@ -62,7 +62,7 @@ linksys-nvram-clean:
-$(MAKE) -C $(LINKSYS_NVRAM_BUILD_DIR) clean -$(MAKE) -C $(LINKSYS_NVRAM_BUILD_DIR) clean
linksys-nvram-dirclean: linksys-nvram-dirclean:
rm -rf $(LINKSYS_NVRAM_BUILD_DIR) rm -rf $(LINKSYS_NVRAM_DIR)
# wlconf tool extracted from linksys firmware GPL sourcetree # wlconf tool extracted from linksys firmware GPL sourcetree
# WRT54GS_3_37_2_1109_US # WRT54GS_3_37_2_1109_US
@ -94,7 +94,7 @@ linksys-wlconf-clean:
-$(MAKE) -C $(LINKSYS_WLCONF_BUILD_DIR) clean -$(MAKE) -C $(LINKSYS_WLCONF_BUILD_DIR) clean
linksys-wlconf-dirclean: linksys-wlconf-dirclean:
rm -rf $(LINKSYS_WLCONF_BUILD_DIR) rm -rf $(LINKSYS_WLCONF_DIR)
# mtd tool # mtd tool
OPENWRT_MTD_SOURCE=package/openwrt/mtd.c OPENWRT_MTD_SOURCE=package/openwrt/mtd.c
@ -144,5 +144,9 @@ openwrt-addpattern: $(OPENWRT_ADDPATTERN_TARGET)
openwrt-addpattern-clean: openwrt-addpattern-clean:
rm $(OPENWRT_ADDPATTERN_TARGET) rm $(OPENWRT_ADDPATTERN_TARGET)
openwrt: linksys-shared linksys-nvram linksys-wlconf openwrt-mtd openwrt-trx openwrt-addpattern linksys: linksys-shared linksys-nvram linksys-wlconf
openwrt: linksys openwrt-mtd openwrt-trx openwrt-addpattern openwrt-jffs2root
openwrt-dirclean: linksys-shared-dirclean linksys-nvram-dirclean linksys-wlconf-dirclean

24
target/Makefile.in
View File

@ -1,5 +1,5 @@
# Default target skeleton stuff, may be overridden # Default target skeleton stuff, may be overridden
DIST=openwrt EXTRAVERSION=
TARGET_SKELETON=target/default/skel.tar.gz TARGET_SKELETON=target/default/skel.tar.gz
TARGET_SKEL_DIR=target/default/target_skeleton TARGET_SKEL_DIR=target/default/target_skeleton
@ -10,16 +10,20 @@ JFFS2FLAGS+=-a 131072
endif endif
$(DIST)-linux.trx: openwrt-trx openwrt-linux.trx: openwrt-trx
PATH=$(TARGET_PATH) trx -o $(DIST)-linux.trx $(LINUX_DIR)/$(LINUX_BINLOC) $(JFFS2FLAGS) $(IMAGE).$(ROOTFS) PATH=$(TARGET_PATH) trx -o openwrt-linux$(EXTRAVERSION).trx \
$(LINUX_DIR)/$(LINUX_BINLOC) $(JFFS2FLAGS) $(IMAGE).$(ROOTFS)
$(DIST)-gs-code.bin: openwrt-addpattern $(DIST)-linux.trx openwrt-gs-code.bin: openwrt-addpattern openwrt-linux.trx
PATH=$(TARGET_PATH) addpattern -2 -i $(DIST)-linux.trx -o $(DIST)-gs-code.bin -g PATH=$(TARGET_PATH) addpattern -2 -i openwrt-linux$(EXTRAVERSION).trx \
-o openwrt-gs-code$(EXTRAVERSION).bin -g
$(DIST)-g-code.bin: $(DIST)-gs-code.bin openwrt-g-code.bin: openwrt-gs-code.bin
sed -e "1s,^W54S,W54G," < $(DIST)-gs-code.bin > $(DIST)-g-code.bin sed -e "1s,^W54S,W54G," < openwrt-gs-code$(EXTRAVERSION).bin > openwrt-g-code$(EXTRAVERSION).bin
openwrt-image: openwrt $(DIST)-g-code.bin openwrt-image: openwrt openwrt-g-code.bin
$(DIST)-image-clean: openwrt-image-clean:
@-rm $(DIST)-* 2>/dev/null @-rm openwrt-* 2>/dev/null
openwrt-image-dirclean: openwrt-dirclean