From 859e8f7f7d8bfbefd610d338d16498190cd51e15 Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 21 Jun 2006 02:16:37 +0000 Subject: build system cleanup. move shared include files into $(TOPDIR)/include, move lzma, mkfs.* into toolchain/ git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4032 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/image.mk | 77 +++++++++++ include/kernel-build.mk | 125 +++++++++++++++++ include/kernel.mk | 77 +++++++++++ include/modules-2.4.mk | 320 +++++++++++++++++++++++++++++++++++++++++++ include/modules-2.6.mk | 357 ++++++++++++++++++++++++++++++++++++++++++++++++ include/netfilter.mk | 116 ++++++++++++++++ include/package.mk | 300 ++++++++++++++++++++++++++++++++++++++++ 7 files changed, 1372 insertions(+) create mode 100644 include/image.mk create mode 100644 include/kernel-build.mk create mode 100644 include/kernel.mk create mode 100644 include/modules-2.4.mk create mode 100644 include/modules-2.6.mk create mode 100644 include/netfilter.mk create mode 100644 include/package.mk (limited to 'include') diff --git a/include/image.mk b/include/image.mk new file mode 100644 index 000000000..f30f0997e --- /dev/null +++ b/include/image.mk @@ -0,0 +1,77 @@ +include $(TOPDIR)/rules.mk + +KDIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD) + +ifneq ($(CONFIG_BIG_ENDIAN),y) +JFFS2OPTS := --pad --little-endian --squash +SQUASHFS_OPTS := -le +else +JFFS2OPTS := --pad --big-endian --squash +SQUASHFS_OPTS := -be +endif + +ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) + ifeq ($(CONFIG_TARGET_ROOTFS_JFFS2),y) + define Image/mkfs/jffs2 + rm -rf $(BUILD_DIR)/root/jffs + + $(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x10000 -o $(KDIR)/root.jffs2-64k -d $(BUILD_DIR)/root + $(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x20000 -o $(KDIR)/root.jffs2-128k -d $(BUILD_DIR)/root + + $(call Image/Build,jffs2-64k) + $(call Image/Build,jffs2-128k) + endef + endif + + ifeq ($(CONFIG_TARGET_ROOTFS_SQUASHFS),y) + define Image/mkfs/squashfs + @mkdir -p $(BUILD_DIR)/root/jffs + $(STAGING_DIR)/bin/mksquashfs-lzma $(BUILD_DIR)/root $(KDIR)/root.squashfs -nopad -noappend -root-owned $(SQUASHFS_OPTS) + $(call Image/Build,squashfs) + endef + endif + + ifeq ($(CONFIG_TARGET_ROOTFS_TGZ),y) + define Image/mkfs/tgz + tar -zcf $(BIN_DIR)/openwrt-rootfs.tgz --owner=root --group=root -C $(BUILD_DIR)/root/ . + endef + endif +endif + +define Image/mkfs/prepare/default + find $(BUILD_DIR)/root -type f -not -perm +0100 | xargs chmod 0644 + find $(BUILD_DIR)/root -type f -perm +0100 | xargs chmod 0755 + find $(BUILD_DIR)/root -type d | xargs chmod 0755 + mkdir -p $(BUILD_DIR)/root/tmp + chmod 0777 $(BUILD_DIR)/root/tmp +endef + +define Image/mkfs/prepare + $(call Image/mkfs/prepare/default) +endef + +define BuildImage +compile: + $(call Build/Compile) + +install: + $(call Image/Prepare) + $(call Image/mkfs/prepare) + $(call Image/BuildKernel) + $(call Image/mkfs/jffs2) + $(call Image/mkfs/squashfs) + $(call Image/mkfs/tgz) + +clean: + $(call Build/Clean) +endef + +compile-targets: +install-targets: +clean-targets: + +source: +prepare: +compile: compile-targets +install: compile install-targets +clean: clean-targets diff --git a/include/kernel-build.mk b/include/kernel-build.mk new file mode 100644 index 000000000..9fbbe4504 --- /dev/null +++ b/include/kernel-build.mk @@ -0,0 +1,125 @@ +include $(TOPDIR)/include/modules-$(KERNEL).mk + +LINUX_SOURCE:=linux-$(LINUX_VERSION).tar.bz2 +LINUX_SITE=http://www.us.kernel.org/pub/linux/kernel/v$(KERNEL) \ + http://www.us.kernel.org/pub/linux/kernel/v$(KERNEL) \ + http://www.kernel.org/pub/linux/kernel/v$(KERNEL) \ + http://www.de.kernel.org/pub/linux/kernel/v$(KERNEL) + +KERNEL_IDIR:=$(KERNEL_BUILD_DIR)/kernel-ipkg +KERNEL_IPKG:=$(KERNEL_BUILD_DIR)/kernel_$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)_$(ARCH).ipk +INSTALL_TARGETS += $(KERNEL_IPKG) + +$(TARGETS): $(PACKAGE_DIR) + +$(LINUX_DIR): + mkdir -p $@ + +$(PACKAGE_DIR): + mkdir -p $@ + +$(DL_DIR)/$(LINUX_SOURCE): + -mkdir -p $(DL_DIR) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(LINUX_SOURCE) $(LINUX_KERNEL_MD5SUM) $(LINUX_SITE) + +$(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE) + -mkdir -p $(KERNEL_BUILD_DIR) + bzcat $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(KERNEL_BUILD_DIR) $(TAR_OPTIONS) - + touch $@ + +ifeq ($(KERNEL),2.4) +$(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched + $(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" \ + $(LINUX_DIR)/Makefile \ + $(LINUX_DIR)/arch/*/Makefile + $(SED) "s,\-mcpu=,\-mtune=,g;" $(LINUX_DIR)/arch/mips/Makefile + $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_KARCH) oldconfig include/linux/compile.h include/linux/version.h + touch $@ + +$(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.configured + $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) dep + touch $@ + +$(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.depend_done +else +$(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched + $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) oldconfig prepare scripts + touch $@ +endif + +ramdisk-config: $(LINUX_DIR)/.configured FORCE + mv $(LINUX_DIR)/.config $(LINUX_DIR)/.config.old + grep -v INITRAMFS $(LINUX_DIR)/.config.old > $(LINUX_DIR)/.config +ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) + echo 'CONFIG_INITRAMFS_SOURCE="../../root"' >> $(LINUX_DIR)/.config + echo 'CONFIG_INITRAMFS_ROOT_UID=0' >> $(LINUX_DIR)/.config + echo 'CONFIG_INITRAMFS_ROOT_GID=0' >> $(LINUX_DIR)/.config + mkdir -p $(BUILD_DIR)/root/etc/init.d + $(CP) ../generic-2.6/files/init $(BUILD_DIR)/root/ +else + rm -f $(BUILD_DIR)/root/init $(BUILD_DIR)/root/etc/init.d/S00initramfs + echo 'CONFIG_INITRAMFS_SOURCE=""' >> $(LINUX_DIR)/.config +endif + +$(LINUX_DIR)/vmlinux: $(STAMP_DIR)/.linux-compile pkg-install ramdisk-config + $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) + +$(LINUX_KERNEL): $(LINUX_DIR)/vmlinux + $(TARGET_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $< $@ + touch -c $(LINUX_KERNEL) + +$(LINUX_DIR)/.modules_done: + rm -rf $(KERNEL_BUILD_DIR)/modules + $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH="$(TARGET_PATH)" modules + $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install + touch $(LINUX_DIR)/.modules_done + +$(STAMP_DIR)/.linux-compile: + @$(MAKE) $(LINUX_DIR)/.modules_done $(TARGETS) $(KERNEL_IPKG) + ln -sf $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) $(BUILD_DIR)/linux + touch $@ + +$(KERNEL_IPKG): + rm -rf $(KERNEL_IDIR) + mkdir -p $(KERNEL_IDIR)/etc + $(SCRIPT_DIR)/make-ipkg-dir.sh $(KERNEL_IDIR) ../control/kernel.control $(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE) $(ARCH) + if [ -f ./config/$(BOARD).modules ]; then \ + cp ./config/$(BOARD).modules $(KERNEL_IDIR)/etc/modules; \ + fi + $(IPKG_BUILD) $(KERNEL_IDIR) $(KERNEL_BUILD_DIR) + +$(TOPDIR)/.kernel.mk: + echo "BOARD:=$(BOARD)" > $@ + echo "LINUX_VERSION:=$(LINUX_VERSION)" >> $@ + echo "LINUX_RELEASE:=$(LINUX_RELEASE)" >> $@ + +pkg-install: FORCE + @{ [ "$(INSTALL_TARGETS)" != "" ] && $(IPKG) install $(INSTALL_TARGETS) || true; } + +source: $(DL_DIR)/$(LINUX_SOURCE) +prepare: + @mkdir -p $(STAMP_DIR) $(PACKAGE_DIR) + @$(MAKE) $(LINUX_DIR)/.configured + +compile: prepare $(STAMP_DIR)/.linux-compile + +install: compile $(LINUX_KERNEL) + +mostlyclean: FORCE + rm -f $(STAMP_DIR)/.linux-compile + rm -f $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)/.modules_done + rm -f $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)/.drivers-unpacked + $(MAKE) -C $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) clean + rm -f $(LINUX_KERNEL) + +rebuild: FORCE + -$(MAKE) mostlyclean + if [ -f $(LINUX_KERNEL) ]; then \ + $(MAKE) clean; \ + fi + $(MAKE) compile $(MAKE_TRACE) + +clean: FORCE + rm -f $(STAMP_DIR)/.linux-compile + rm -rf $(KERNEL_BUILD_DIR) + rm -f $(TARGETS) diff --git a/include/kernel.mk b/include/kernel.mk new file mode 100644 index 000000000..5c64ee4e1 --- /dev/null +++ b/include/kernel.mk @@ -0,0 +1,77 @@ +ifneq ($(DUMP),1) +include $(TOPDIR)/.kernel.mk + +KERNEL:=unknown +ifneq (,$(findstring 2.4.,$(LINUX_VERSION))) +KERNEL:=2.4 +LINUX_KMOD_SUFFIX=o +endif +ifneq (,$(findstring 2.6.,$(LINUX_VERSION))) +KERNEL:=2.6 +LINUX_KMOD_SUFFIX=ko +endif + +LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \ + -e 's/mipsel/mips/' \ + -e 's/mipseb/mips/' \ + -e 's/powerpc/ppc/' \ + -e 's/sh[234]/sh/' \ + -e 's/armeb/arm/' \ +) + +KERNEL_BUILD_DIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD) +LINUX_DIR := $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) + +MODULES_SUBDIR:=lib/modules/$(LINUX_VERSION) +MODULES_DIR := $(KERNEL_BUILD_DIR)/modules/$(MODULES_SUBDIR) +TARGET_MODULES_DIR := $(LINUX_TARGET_DIR)/$(MODULES_SUBDIR) +KMOD_BUILD_DIR := $(KERNEL_BUILD_DIR)/linux-modules + +LINUX_KERNEL:=$(KERNEL_BUILD_DIR)/vmlinux +endif + +# FIXME: remove this crap +define KMOD_template +ifeq ($$(strip $(4)),) +KDEPEND_$(1):=m +else +KDEPEND_$(1):=$($(4)) +endif + +IDEPEND_$(1):=kernel ($(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)) $(foreach pkg,$(5),", $(pkg)") + +PKG_$(1) := $(PACKAGE_DIR)/kmod-$(2)_$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)_$(ARCH).ipk +I_$(1) := $(KMOD_BUILD_DIR)/ipkg/$(2) + +ifeq ($$(KDEPEND_$(1)),m) +ifneq ($(CONFIG_PACKAGE_KMOD_$(1)),) +TARGETS += $$(PKG_$(1)) +endif +ifeq ($(CONFIG_PACKAGE_KMOD_$(1)),y) +INSTALL_TARGETS += $$(PKG_$(1)) +endif +endif + +$$(PKG_$(1)): $(LINUX_DIR)/.modules_done + rm -rf $$(I_$(1)) + $(SCRIPT_DIR)/make-ipkg-dir.sh $$(I_$(1)) ../control/kmod-$(2).control $(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE) $(ARCH) + echo "Depends: $$(IDEPEND_$(1))" >> $$(I_$(1))/CONTROL/control +ifneq ($(strip $(3)),) + mkdir -p $$(I_$(1))/lib/modules/$(LINUX_VERSION) + $(CP) $(3) $$(I_$(1))/lib/modules/$(LINUX_VERSION) +endif +ifneq ($(6),) + mkdir -p $$(I_$(1))/etc/modules.d + for module in $(7); do \ + echo $$$$module >> $$(I_$(1))/etc/modules.d/$(6)-$(2); \ + done + echo "#!/bin/sh" >> $$(I_$(1))/CONTROL/postinst + echo "[ -z \"\$$$$IPKG_INSTROOT\" ] || exit" >> $$(I_$(1))/CONTROL/postinst + echo ". /etc/functions.sh" >> $$(I_$(1))/CONTROL/postinst + echo "load_modules /etc/modules.d/$(6)-$(2)" >> $$(I_$(1))/CONTROL/postinst + chmod 0755 $$(I_$(1))/CONTROL/postinst +endif + $(8) + $(IPKG_BUILD) $$(I_$(1)) $(PACKAGE_DIR) +endef + diff --git a/include/modules-2.4.mk b/include/modules-2.4.mk new file mode 100644 index 000000000..71864ad8e --- /dev/null +++ b/include/modules-2.4.mk @@ -0,0 +1,320 @@ +include $(TOPDIR)/include/netfilter.mk + +# Networking + +$(eval $(call KMOD_template,ATM,atm,\ + $(MODULES_DIR)/kernel/net/atm/atm.o \ + $(MODULES_DIR)/kernel/net/atm/br2684.o \ +,CONFIG_ATM,,50,atm)) + +$(eval $(call KMOD_template,GRE,gre,\ + $(MODULES_DIR)/kernel/net/ipv4/ip_gre.o \ +,CONFIG_NET_IPGRE)) + +$(eval $(call KMOD_template,IMQ,imq,\ + $(MODULES_DIR)/kernel/net/ipv4/netfilter/*IMQ*.o \ + $(MODULES_DIR)/kernel/drivers/net/imq.o \ +)) +$(eval $(call KMOD_template,IPIP,ipip,\ + $(MODULES_DIR)/kernel/net/ipv4/ipip.o \ +,CONFIG_NET_IPIP,,60,ipip)) + +$(eval $(call KMOD_template,IPV6,ipv6,\ + $(MODULES_DIR)/kernel/net/ipv6/ipv6.o \ +,CONFIG_IPV6,,20,ipv6)) + +$(eval $(call KMOD_template,PPP,ppp,\ + $(MODULES_DIR)/kernel/drivers/net/ppp_async.o \ + $(MODULES_DIR)/kernel/drivers/net/ppp_generic.o \ + $(MODULES_DIR)/kernel/drivers/net/slhc.o \ + $(MODULES_DIR)/kernel/drivers/net/pppox.o \ +,CONFIG_PPP)) + +$(eval $(call KMOD_template,MPPE,mppe,\ + $(MODULES_DIR)/kernel/drivers/net/ppp_mppe_mppc.o \ +,CONFIG_PPP_MPPE_MPPC)) + +$(eval $(call KMOD_template,PPPOATM,pppoatm,\ + $(MODULES_DIR)/kernel/net/atm/pppoatm.o \ +,CONFIG_PPPOATM)) + +$(eval $(call KMOD_template,PPPOE,pppoe,\ + $(MODULES_DIR)/kernel/drivers/net/pppoe.o \ +,CONFIG_PPPOE)) + +$(eval $(call KMOD_template,SCHED,sched,\ + $(MODULES_DIR)/kernel/net/sched/*.o \ +)) + +$(eval $(call KMOD_template,TUN,tun,\ + $(MODULES_DIR)/kernel/drivers/net/tun.o \ +,CONFIG_TUN,,20,tun)) + +# Filtering / Firewalling + +$(eval $(call KMOD_template,ARPTABLES,arptables,\ + $(MODULES_DIR)/kernel/net/ipv4/netfilter/arp*.o \ +,CONFIG_IP_NF_ARPTABLES)) + +$(eval $(call KMOD_template,EBTABLES,ebtables,\ + $(MODULES_DIR)/kernel/net/bridge/netfilter/*.o \ +,CONFIG_BRIDGE_NF_EBTABLES)) + +# metapackage for compatibility ... +$(eval $(call KMOD_template,IPTABLES_EXTRA,iptables-extra,\ +,,kmod-ipt-conntrack kmod-ipt-extra kmod-ipt-filter kmod-ipt-ipopt kmod-ipt-ipsec kmod-ipt-nat kmod-ipt-nat-extra kmod-ipt-queue kmod-ipt-ulogd)) + +$(eval $(call KMOD_template,IPT_CONNTRACK,ipt-conntrack,\ + $(foreach mod,$(IPT_CONNTRACK-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \ +)) + +$(eval $(call KMOD_template,IPT_EXTRA,ipt-extra,\ + $(foreach mod,$(IPT_EXTRA-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \ +)) + +$(eval $(call KMOD_template,IPT_FILTER,ipt-filter,\ + $(foreach mod,$(IPT_FILTER-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \ +)) + +$(eval $(call KMOD_template,IPT_IPOPT,ipt-ipopt,\ + $(foreach mod,$(IPT_IPOPT-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \ +)) + +$(eval $(call KMOD_template,IPT_IPSEC,ipt-ipsec,\ + $(foreach mod,$(IPT_IPSEC-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \ +)) + +$(eval $(call KMOD_template,IPT_NAT,ipt-nat,\ + $(foreach mod,$(IPT_NAT-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \ +)) + +$(eval $(call KMOD_template,IPT_NAT_EXTRA,ipt-nat-extra,\ + $(foreach mod,$(IPT_NAT_EXTRA-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \ +,,,40,$(IPT_NAT_EXTRA-m))) + +$(eval $(call KMOD_template,IPT_QUEUE,ipt-queue,\ + $(foreach mod,$(IPT_QUEUE-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \ +)) + +$(eval $(call KMOD_template,IPT_ULOG,ipt-ulog,\ + $(foreach mod,$(IPT_ULOG-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \ +)) + +$(eval $(call KMOD_template,IP6TABLES,ip6tables,\ + $(MODULES_DIR)/kernel/net/ipv6/netfilter/ip*.o \ +,CONFIG_IP6_NF_IPTABLES,kmod-ipv6)) + + +# Block devices + +$(eval $(call KMOD_template,IDE,ide,\ + $(MODULES_DIR)/kernel/drivers/ide/*.o \ + $(MODULES_DIR)/kernel/drivers/ide/*/*.o \ +,CONFIG_IDE,,20,pdc202xx_old ide-core ide-detect ide-disk)) + +$(eval $(call KMOD_template,LOOP,loop,\ + $(MODULES_DIR)/kernel/drivers/block/loop.o \ +,CONFIG_BLK_DEV_LOOP,,20,loop)) + +$(eval $(call KMOD_template,NBD,nbd,\ + $(MODULES_DIR)/kernel/drivers/block/nbd.o \ +,CONFIG_BLK_DEV_NBD,,20,nbd)) + + +# Crypto + +ifneq ($(wildcard $(MODULES_DIR)/kernel/crypto/*.o),) +CONFIG_CRYPTO:=m +endif +$(eval $(call KMOD_template,CRYPTO,crypto,\ + $(MODULES_DIR)/kernel/crypto/*.o \ +,CONFIG_CRYPTO)) + + +# Filesystems + +$(eval $(call KMOD_template,FS_CIFS,fs-cifs,\ + $(MODULES_DIR)/kernel/fs/cifs/cifs.o \ +,CONFIG_CIFS,,30,cifs)) + +$(eval $(call KMOD_template,FS_MINIX,fs-minix,\ + $(MODULES_DIR)/kernel/fs/minix/*.o \ +,CONFIG_MINIX_FS,,30,minix)) + +$(eval $(call KMOD_template,FS_EXT2,fs-ext2,\ + $(MODULES_DIR)/kernel/fs/ext2/*.o \ +,CONFIG_EXT2_FS,,30,ext2)) + +$(eval $(call KMOD_template,FS_EXT3,fs-ext3,\ + $(MODULES_DIR)/kernel/fs/ext3/*.o \ + $(MODULES_DIR)/kernel/fs/jbd/*.o \ +,CONFIG_EXT3_FS,,30,jbd ext3)) + +$(eval $(call KMOD_template,FS_HFSPLUS,fs-hfsplus,\ + $(MODULES_DIR)/kernel/fs/hfsplus/*.o \ +,CONFIG_HFSPLUS_FS,,30,hfsplus)) + +$(eval $(call KMOD_template,FS_NFS,fs-nfs,\ + $(MODULES_DIR)/kernel/fs/lockd/*.o \ + $(MODULES_DIR)/kernel/fs/nfs/*.o \ + $(MODULES_DIR)/kernel/net/sunrpc/*.o \ +,CONFIG_NFS_FS,,30,sunrpc lockd nfs)) + +$(eval $(call KMOD_template,FS_VFAT,fs-vfat,\ + $(MODULES_DIR)/kernel/fs/vfat/vfat.o \ + $(MODULES_DIR)/kernel/fs/fat/fat.o \ +,CONFIG_VFAT_FS,,30,fat vfat)) + +$(eval $(call KMOD_template,FS_XFS,fs-xfs,\ + $(MODULES_DIR)/kernel/fs/xfs/*.o \ +,CONFIG_XFS_FS,,30,xfs)) + + +# Multimedia + +$(eval $(call KMOD_template,PWC,pwc,\ + $(MODULES_DIR)/kernel/drivers/usb/pwc.o \ +,CONFIG_USB_PWC,kmod-videodev,63,pwc)) + +$(eval $(call KMOD_template,SOUNDCORE,soundcore,\ + $(MODULES_DIR)/kernel/drivers/sound/soundcore.o \ +,CONFIG_SOUND,,30,soundcore)) + +$(eval $(call KMOD_template,VIDEODEV,videodev,\ + $(MODULES_DIR)/kernel/drivers/media/video/videodev.o \ +,CONFIG_VIDEO_DEV,,62,videodev)) + + +# Network devices + +$(eval $(call KMOD_template,NET_3C59X,net-3c59x,\ + $(MODULES_DIR)/kernel/drivers/net/3c59x.o \ +,CONFIG_VORTEX,,10,3c59x)) + +$(eval $(call KMOD_template,NET_8139TOO,net-8139too,\ + $(MODULES_DIR)/kernel/drivers/net/8139too.o \ + $(MODULES_DIR)/kernel/drivers/net/mii.o \ +,CONFIG_8139TOO,,10,mii 8139too)) + +$(eval $(call KMOD_template,NET_AIRO,net-airo,\ + $(MODULES_DIR)/kernel/drivers/net/wireless/airo.o \ +,CONFIG_AIRO,,10,airo)) + +$(eval $(call KMOD_template,NET_E100,net-e100,\ + $(MODULES_DIR)/kernel/drivers/net/e100.o \ +,CONFIG_E100,,10,e100)) + +$(eval $(call KMOD_template,NET_HERMES,net-hermes,\ + $(MODULES_DIR)/kernel/drivers/net/wireless/hermes.o \ + $(MODULES_DIR)/kernel/drivers/net/wireless/orinoco.o \ +,CONFIG_HERMES,,10,hermes orinoco)) + +$(eval $(call KMOD_template,NET_HERMES_PCI,net-hermes-pci,\ + $(MODULES_DIR)/kernel/drivers/net/wireless/orinoco_pci.o \ +,CONFIG_PCI_HERMES,kmod-net-hermes,11,orinoco_pci)) + +$(eval $(call KMOD_template,NET_HERMES_PCI,net-hermes-plx,\ + $(MODULES_DIR)/kernel/drivers/net/wireless/orinoco_plx.o \ +,CONFIG_PLX_HERMES,kmod-net-hermes,11,orinoco_plx)) + +$(eval $(call KMOD_template,NET_NATSEMI,net-natsemi,\ + $(MODULES_DIR)/kernel/drivers/net/natsemi.o \ +,CONFIG_NATSEMI,,10,natsemi)) + +$(eval $(call KMOD_template,NET_PRISM54,net-prism54,\ + $(MODULES_DIR)/kernel/drivers/net/wireless/prism54/prism54.o \ +,CONFIG_PRISM54,,10,prism54)) + + +# PCMCIA/CardBus + +$(eval $(call KMOD_template,PCMCIA_CORE,pcmcia-core,\ + $(MODULES_DIR)/kernel/drivers/pcmcia/pcmcia_core.o \ + $(MODULES_DIR)/kernel/drivers/pcmcia/yenta_socket.o \ + $(MODULES_DIR)/kernel/drivers/pcmcia/ds.o \ +,CONFIG_PCMCIA,,50,pcmcia_core yenta_socket ds)) + +$(eval $(call KMOD_template,PCMCIA_SERIAL,pcmcia-serial,\ + $(MODULES_DIR)/kernel/drivers/char/pcmcia/serial_cs.o \ +,CONFIG_PCMCIA_SERIAL_CS,kmod-pcmcia-core,51,serial_cs)) + + +# USB + +$(eval $(call KMOD_template,USB,usb-core,\ + $(MODULES_DIR)/kernel/drivers/usb/usbcore.o \ +,CONFIG_USB,,50,usbcore)) + +$(eval $(call KMOD_template,USB_OHCI,usb-ohci,\ + $(MODULES_DIR)/kernel/drivers/usb/host/usb-ohci.o \ +,CONFIG_USB_OHCI,kmod-usb-core,60,usb-ohci)) + +$(eval $(call KMOD_template,USB_UHCI,usb-uhci,\ + $(MODULES_DIR)/kernel/drivers/usb/host/uhci.o \ +,CONFIG_USB_UHCI_ALT,kmod-usb-core,60,uhci)) + +$(eval $(call KMOD_template,USB2,usb2,\ + $(MODULES_DIR)/kernel/drivers/usb/host/ehci-hcd.o \ +,CONFIG_USB_EHCI_HCD,kmod-usb-core,60,ehci-hcd)) + +$(eval $(call KMOD_template,USB_ACM,usb-acm,\ + $(MODULES_DIR)/kernel/drivers/usb/acm.o \ +,CONFIG_USB_ACM)) + +$(eval $(call KMOD_template,USB_AUDIO,usb-audio,\ + $(MODULES_DIR)/kernel/drivers/usb/audio.o \ +,CONFIG_USB_AUDIO,kmod-soundcore kmod-usb-core,61,audio)) + +$(eval $(call KMOD_template,USB_PRINTER,usb-printer,\ + $(MODULES_DIR)/kernel/drivers/usb/printer.o \ +,CONFIG_USB_PRINTER,kmod-usb-core,60,printer)) + +$(eval $(call KMOD_template,USB_SERIAL,usb-serial,\ + $(MODULES_DIR)/kernel/drivers/usb/serial/usbserial.o \ +,CONFIG_USB_SERIAL,kmod-usb-core,60,usbserial)) + +$(eval $(call KMOD_template,USB_SERIAL_BELKIN,usb-serial-belkin,\ + $(MODULES_DIR)/kernel/drivers/usb/serial/belkin_sa.o \ +,CONFIG_USB_SERIAL_BELKIN,kmod-usb-serial,61,belkin_sa)) + +$(eval $(call KMOD_template,USB_SERIAL_FTDI,usb-serial-ftdi,\ + $(MODULES_DIR)/kernel/drivers/usb/serial/ftdi_sio.o \ +,CONFIG_USB_SERIAL_FTDI_SIO,kmod-usb-serial,61,ftdi_sio)) + +$(eval $(call KMOD_template,USB_SERIAL_MCT_U232,usb-serial-mct-u232,\ + $(MODULES_DIR)/kernel/drivers/usb/serial/mct_u232.o \ +,CONFIG_USB_SERIAL_MCT_U232,kmod-usb-serial,61,mct_u232)) + +$(eval $(call KMOD_template,USB_SERIAL_PL2303,usb-serial-pl2303,\ + $(MODULES_DIR)/kernel/drivers/usb/serial/pl2303.o \ +,CONFIG_USB_SERIAL_PL2303,kmod-usb-serial,61,pl2303)) + +$(eval $(call KMOD_template,USB_SERIAL_VISOR,usb-serial-visor,\ + $(MODULES_DIR)/kernel/drivers/usb/serial/visor.o \ +,CONFIG_USB_SERIAL_VISOR,kmod-usb-serial,61,visor)) + +$(eval $(call KMOD_template,USB_STORAGE,usb-storage,\ + $(MODULES_DIR)/kernel/drivers/scsi/*.o \ + $(MODULES_DIR)/kernel/drivers/usb/storage/*.o \ +,CONFIG_USB_STORAGE,kmod-usb-core,60,scsi_mod sd_mod usb-storage)) + + +# Misc. devices + +$(eval $(call KMOD_template,AX25,ax25,\ + $(MODULES_DIR)/kernel/net/ax25/ax25.o \ + $(MODULES_DIR)/kernel/drivers/net/hamradio/mkiss.o \ +,CONFIG_AX25,,90,ax25 mkiss)) + +$(eval $(call KMOD_template,BLUETOOTH,bluetooth,\ + $(MODULES_DIR)/kernel/net/bluetooth/*.o \ + $(MODULES_DIR)/kernel/net/bluetooth/rfcomm/*.o \ + $(MODULES_DIR)/kernel/drivers/bluetooth/*.o \ +,CONFIG_BLUEZ)) + +$(eval $(call KMOD_template,SOFTDOG,softdog,\ + $(MODULES_DIR)/kernel/drivers/char/softdog.o \ +,CONFIG_SOFT_WATCHDOG,,95,softdog)) + + + diff --git a/include/modules-2.6.mk b/include/modules-2.6.mk new file mode 100644 index 000000000..ec9f5da44 --- /dev/null +++ b/include/modules-2.6.mk @@ -0,0 +1,357 @@ +NF_2_6:=1 +include $(TOPDIR)/include/netfilter.mk + +# Networking + +$(eval $(call KMOD_template,ATM,atm,\ + $(MODULES_DIR)/kernel/net/atm/atm.ko \ + $(MODULES_DIR)/kernel/net/atm/br2684.ko \ + $(MODULES_DIR)/kernel/drivers/atm/atmtcp.ko \ +,CONFIG_ATM,,50,atm)) + +$(eval $(call KMOD_template,GRE,gre,\ + $(MODULES_DIR)/kernel/net/ipv4/ip_gre.ko \ +,CONFIG_NET_IPGRE)) + +$(eval $(call KMOD_template,IMQ,imq,\ + $(MODULES_DIR)/kernel/net/ipv4/netfilter/*IMQ*.ko \ + $(MODULES_DIR)/kernel/drivers/net/imq.ko \ +)) + +$(eval $(call KMOD_template,IPIP,ipip,\ + $(MODULES_DIR)/kernel/net/ipv4/ipip.ko \ +,CONFIG_NET_IPIP,,60,ipip)) + +$(eval $(call KMOD_template,IPV6,ipv6,\ + $(MODULES_DIR)/kernel/net/ipv6/ipv6.ko \ +,CONFIG_IPV6,,20,ipv6)) + +$(eval $(call KMOD_template,PPP,ppp,\ + $(MODULES_DIR)/kernel/drivers/net/ppp_async.ko \ + $(MODULES_DIR)/kernel/drivers/net/ppp_generic.ko \ + $(MODULES_DIR)/kernel/drivers/net/slhc.ko \ + $(MODULES_DIR)/kernel/lib/crc-ccitt.ko \ +,CONFIG_PPP)) + +#$(eval $(call KMOD_template,MPPE,mppe,\ +# $(MODULES_DIR)/kernel/drivers/net/ppp_mppe_mppc.ko \ +#,CONFIG_PPP_MPPE_MPPC)) + +$(eval $(call KMOD_template,PPPOATM,pppoatm,\ + $(MODULES_DIR)/kernel/net/atm/pppoatm.ko \ +,CONFIG_PPPOATM)) + +$(eval $(call KMOD_template,PPPOE,pppoe,\ + $(MODULES_DIR)/kernel/drivers/net/pppoe.ko \ + $(MODULES_DIR)/kernel/drivers/net/pppox.ko \ +,CONFIG_PPPOE)) + +$(eval $(call KMOD_template,SCHED,sched,\ + $(MODULES_DIR)/kernel/net/sched/*.ko \ +)) + +$(eval $(call KMOD_template,TUN,tun,\ + $(MODULES_DIR)/kernel/drivers/net/tun.ko \ +,CONFIG_TUN,,20,tun)) + + +# Filtering / Firewalling + +$(eval $(call KMOD_template,ARPTABLES,arptables,\ + $(MODULES_DIR)/kernel/net/ipv4/netfilter/arp*.ko \ +,CONFIG_IP_NF_ARPTABLES)) + +$(eval $(call KMOD_template,EBTABLES,ebtables,\ + $(MODULES_DIR)/kernel/net/bridge/netfilter/*.ko \ +,CONFIG_BRIDGE_NF_EBTABLES)) + +# metapackage for compatibility ... +$(eval $(call KMOD_template,IPTABLES_EXTRA,iptables-extra,\ +,,kmod-ipt-conntrack kmod-ipt-extra kmod-ipt-filter kmod-ipt-ipopt kmod-ipt-ipsec kmod-ipt-nat kmod-ipt-nat-extra kmod-ipt-queue kmod-ipt-ulogd)) + +$(eval $(call KMOD_template,IPT_CONNTRACK,ipt-conntrack,\ + $(foreach mod,$(IPT_CONNTRACK-m),$(MODULES_DIR)/kernel/net/$(mod).ko) \ +)) + +$(eval $(call KMOD_template,IPT_EXTRA,ipt-extra,\ + $(foreach mod,$(IPT_EXTRA-m),$(MODULES_DIR)/kernel/net/$(mod).ko) \ +)) + +$(eval $(call KMOD_template,IPT_FILTER,ipt-filter,\ + $(foreach mod,$(IPT_FILTER-m),$(MODULES_DIR)/kernel/net/$(mod).ko) \ +)) + +$(eval $(call KMOD_template,IPT_IPOPT,ipt-ipopt,\ + $(foreach mod,$(IPT_IPOPT-m),$(MODULES_DIR)/kernel/net/$(mod).ko) \ +)) + +$(eval $(call KMOD_template,IPT_IPSEC,ipt-ipsec,\ + $(foreach mod,$(IPT_IPSEC-m),$(MODULES_DIR)/kernel/net/$(mod).ko) \ +)) + +$(eval $(call KMOD_template,IPT_NAT,ipt-nat,\ + $(foreach mod,$(IPT_NAT-m),$(MODULES_DIR)/kernel/net/$(mod).ko) \ +)) + +$(eval $(call KMOD_template,IPT_NAT_EXTRA,ipt-nat-extra,\ + $(foreach mod,$(IPT_NAT_EXTRA-m),$(MODULES_DIR)/kernel/net/$(mod).ko) \ +,,,40,$(IPT_NAT_EXTRA-m))) + +$(eval $(call KMOD_template,IPT_QUEUE,ipt-queue,\ + $(foreach mod,$(IPT_QUEUE-m),$(MODULES_DIR)/kernel/net/$(mod).ko) \ +)) + +$(eval $(call KMOD_template,IPT_ULOG,ipt-ulog,\ + $(foreach mod,$(IPT_ULOG-m),$(MODULES_DIR)/kernel/net/$(mod).ko) \ +)) + +$(eval $(call KMOD_template,IP6TABLES,ip6tables,\ + $(MODULES_DIR)/kernel/net/ipv6/netfilter/ip*.ko \ +,CONFIG_IP6_NF_IPTABLES,kmod-ipv6)) + + +# Block devices + +$(eval $(call KMOD_template,IDE,ide,\ + $(MODULES_DIR)/kernel/drivers/ide/*.ko \ + $(MODULES_DIR)/kernel/drivers/ide/*/*.ko \ +,CONFIG_IDE)) + +$(eval $(call KMOD_template,LOOP,loop,\ + $(MODULES_DIR)/kernel/drivers/block/loop.ko \ +,CONFIG_BLK_DEV_LOOP,,20,loop)) + +$(eval $(call KMOD_template,NBD,nbd,\ + $(MODULES_DIR)/kernel/drivers/block/nbd.ko \ +,CONFIG_BLK_DEV_NBD,,20,nbd)) + + +# Crypto + +$(eval $(call KMOD_template,CRYPTO,crypto,\ + $(MODULES_DIR)/kernel/crypto/*.ko \ +)) + + +# Filesystems + +$(eval $(call KMOD_template,FS_CIFS,fs-cifs,\ + $(MODULES_DIR)/kernel/fs/cifs/cifs.ko \ +,CONFIG_CIFS,kmod-nls-base,30,cifs)) + +$(eval $(call KMOD_template,FS_MINIX,fs-minix,\ + $(MODULES_DIR)/kernel/fs/minix/minix.ko \ +,CONFIG_MINIX_FS,,30,minix)) + +$(eval $(call KMOD_template,FS_EXT2,fs-ext2,\ + $(MODULES_DIR)/kernel/fs/ext2/ext2.ko \ +,CONFIG_EXT2_FS,,30,ext2)) + +$(eval $(call KMOD_template,FS_EXT3,fs-ext3,\ + $(MODULES_DIR)/kernel/fs/ext3/ext3.ko \ + $(MODULES_DIR)/kernel/fs/jbd/jbd.ko \ +,CONFIG_EXT3_FS,,30,jbd ext3)) + +$(eval $(call KMOD_template,FS_HFSPLUS,fs-hfsplus,\ + $(MODULES_DIR)/kernel/fs/hfsplus/hfsplus.ko \ +,CONFIG_HFSPLUS_FS,kmod-nls-base,30,hfsplus)) + +$(eval $(call KMOD_template,FS_NFS,fs-nfs,\ + $(MODULES_DIR)/kernel/fs/lockd/lockd.ko \ + $(MODULES_DIR)/kernel/fs/nfs/nfs.ko \ + $(MODULES_DIR)/kernel/net/sunrpc/sunrpc.ko \ +,CONFIG_NFS_FS,,30,sunrpc lockd nfs)) + +$(eval $(call KMOD_template,FS_VFAT,fs-vfat,\ + $(MODULES_DIR)/kernel/fs/fat/fat.ko \ + $(MODULES_DIR)/kernel/fs/vfat/vfat.ko \ +,CONFIG_VFAT_FS,kmod-nls-base,30,fat vfat)) + +$(eval $(call KMOD_template,FS_XFS,fs-xfs,\ + $(MODULES_DIR)/kernel/fs/xfs/xfs.ko \ +,CONFIG_XFS_FS,,30,xfs)) + + +# Multimedia + +$(eval $(call KMOD_template,PWC,pwc,\ + $(MODULES_DIR)/kernel/drivers/usb/media/pwc/pwc.ko \ +,CONFIG_USB_PWC,kmod-videodev,63,pwc)) + +$(eval $(call KMOD_template,SOUNDCORE,soundcore,\ + $(MODULES_DIR)/kernel/sound/soundcore.ko \ +,CONFIG_SOUND,,30,soundcore)) + +$(eval $(call KMOD_template,VIDEODEV,videodev,\ + $(MODULES_DIR)/kernel/drivers/media/video/v4l1-compat.ko \ + $(MODULES_DIR)/kernel/drivers/media/video/v4l2-common.ko \ + $(MODULES_DIR)/kernel/drivers/media/video/videodev.ko \ +,CONFIG_VIDEO_DEV,,62,videodev)) + + +# NLS + +$(eval $(call KMOD_template,NLS_BASE,nls-base,\ + $(MODULES_DIR)/kernel/fs/nls/nls_base.ko \ +,CONFIG_NLS,,20,nls_base)) + +$(eval $(call KMOD_template,NLS_CP437,nls-cp437,\ + $(MODULES_DIR)/kernel/fs/nls/nls_cp437.ko \ +,CONFIG_NLS_CODEPAGE_437,,20,nls_cp437)) + +$(eval $(call KMOD_template,NLS_CP850,nls-cp850,\ + $(MODULES_DIR)/kernel/fs/nls/nls_cp850.ko \ +,CONFIG_NLS_CODEPAGE_850,,20,nls_cp850)) + +$(eval $(call KMOD_template,NLS_ISO8859_1,nls-iso8859-1,\ + $(MODULES_DIR)/kernel/fs/nls/nls_iso8859-1.ko \ +,CONFIG_NLS_ISO8859_1,,20,nls_iso8859-1)) + +$(eval $(call KMOD_template,NLS_ISO8859_15,nls-iso8859-15,\ + $(MODULES_DIR)/kernel/fs/nls/nls_iso8859-15.ko \ +,CONFIG_NLS_ISO8859_15,,20,nls_iso8859-15)) + +$(eval $(call KMOD_template,NLS_UTF8,nls-utf8,\ + $(MODULES_DIR)/kernel/fs/nls/nls_utf8.ko \ +,CONFIG_NLS_UTF8,,20,nls_utf8)) + + +# Network devices + +$(eval $(call KMOD_template,NET_3C59X,net-3c59x,\ + $(MODULES_DIR)/kernel/drivers/net/3c59x.ko \ +,CONFIG_VORTEX,,10,3c59x)) + +$(eval $(call KMOD_template,NET_8139TOO,net-8139too,\ + $(MODULES_DIR)/kernel/drivers/net/8139too.ko \ +,CONFIG_8139TOO,,10,8139too)) + +$(eval $(call KMOD_template,NET_AIRO,net-airo,\ + $(MODULES_DIR)/kernel/drivers/net/wireless/airo.ko \ +,CONFIG_AIRO,,10,airo)) + +$(eval $(call KMOD_template,NET_E100,net-e100,\ + $(MODULES_DIR)/kernel/drivers/net/e100.ko \ +,CONFIG_E100,,10,e100)) + +$(eval $(call KMOD_template,NET_HERMES,net-hermes,\ + $(MODULES_DIR)/kernel/drivers/net/wireless/hermes.ko \ + $(MODULES_DIR)/kernel/drivers/net/wireless/orinoco.ko \ +,CONFIG_HERMES,,10,hermes orinoco)) + +$(eval $(call KMOD_template,NET_HERMES_PCI,net-hermes-pci,\ + $(MODULES_DIR)/kernel/drivers/net/wireless/orinoco_pci.ko \ +,CONFIG_PCI_HERMES,kmod-net-hermes,11,orinoco_pci)) + +$(eval $(call KMOD_template,NET_HERMES_PCI,net-hermes-plx,\ + $(MODULES_DIR)/kernel/drivers/net/wireless/orinoco_plx.ko \ +,CONFIG_PLX_HERMES,kmod-net-hermes,11,orinoco_plx)) + +$(eval $(call KMOD_template,NET_NATSEMI,net-natsemi,\ + $(MODULES_DIR)/kernel/drivers/net/natsemi.ko \ +,CONFIG_NATSEMI,,10,natsemi)) + +$(eval $(call KMOD_template,NET_PRISM54,net-prism54,\ + $(MODULES_DIR)/kernel/drivers/net/wireless/prism54/prism54.ko \ +,CONFIG_PRISM54,,10,prism54)) + + +# PCMCIA/CardBus + +$(eval $(call KMOD_template,PCMCIA_CORE,pcmcia-core,\ + $(MODULES_DIR)/kernel/drivers/pcmcia/pcmcia.ko \ + $(MODULES_DIR)/kernel/drivers/pcmcia/pcmcia_core.ko \ + $(MODULES_DIR)/kernel/drivers/pcmcia/yenta_socket.ko \ + $(MODULES_DIR)/kernel/drivers/pcmcia/rsrc_nonstatic.ko \ +,CONFIG_PCMCIA,,50,pcmcia_core pcmcia yenta_socket rsrc_nonstatic)) + +$(eval $(call KMOD_template,PCMCIA_SERIAL,pcmcia-serial,\ + $(MODULES_DIR)/kernel/drivers/serial/serial_cs.ko \ +,CONFIG_SERIAL_8250_CS)) + + +# USB + +$(eval $(call KMOD_template,USB,usb-core,\ + $(MODULES_DIR)/kernel/drivers/usb/core/usbcore.ko \ +,CONFIG_USB,,50,usbcore)) + +$(eval $(call KMOD_template,USB_OHCI,usb-ohci,\ + $(MODULES_DIR)/kernel/drivers/usb/host/ohci-hcd.ko \ +,CONFIG_USB_OHCI_HCD,kmod-usb-core,60,ohci-hcd)) + +$(eval $(call KMOD_template,USB_UHCI,usb-uhci,\ + $(MODULES_DIR)/kernel/drivers/usb/host/uhci-hcd.ko \ +,CONFIG_USB_UHCI_HCD,kmod-usb-core,60,uhci-hcd)) + +$(eval $(call KMOD_template,USB2,usb2,\ + $(MODULES_DIR)/kernel/drivers/usb/host/ehci-hcd.ko \ +,CONFIG_USB_EHCI_HCD,kmod-usb-core,60,ehci-hcd)) + +$(eval $(call KMOD_template,USB_ACM,usb-acm,\ + $(MODULES_DIR)/kernel/drivers/usb/class/cdc-acm.ko \ +,CONFIG_USB_ACM)) + +$(eval $(call KMOD_template,USB_AUDIO,usb-audio,\ + $(MODULES_DIR)/kernel/drivers/usb/class/audio.ko \ +,CONFIG_USB_AUDIO,kmod-soundcore kmod-usb-core,61,audio)) + +$(eval $(call KMOD_template,USB_PRINTER,usb-printer,\ + $(MODULES_DIR)/kernel/drivers/usb/class/usblp.ko \ +,CONFIG_USB_PRINTER,kmod-usb-core,60,usblp)) + +$(eval $(call KMOD_template,USB_SERIAL,usb-serial,\ + $(MODULES_DIR)/kernel/drivers/usb/serial/usbserial.ko \ +,CONFIG_USB_SERIAL,kmod-usb-core,60,usbserial)) + +$(eval $(call KMOD_template,USB_SERIAL_BELKIN,usb-serial-belkin,\ + $(MODULES_DIR)/kernel/drivers/usb/serial/belkin_sa.ko \ +,CONFIG_USB_SERIAL_BELKIN,kmod-usb-serial,61,belkin_sa)) + +$(eval $(call KMOD_template,USB_SERIAL_FTDI,usb-serial-ftdi,\ + $(MODULES_DIR)/kernel/drivers/usb/serial/ftdi_sio.ko \ +,CONFIG_USB_SERIAL_FTDI_SIO,kmod-usb-serial,61,ftdi_sio)) + +$(eval $(call KMOD_template,USB_SERIAL_MCT_U232,usb-serial-mct-u232,\ + $(MODULES_DIR)/kernel/drivers/usb/serial/mct_u232.ko \ +,CONFIG_USB_SERIAL_MCT_U232,kmod-usb-serial,61,mct_u232)) + +$(eval $(call KMOD_template,USB_SERIAL_PL2303,usb-serial-pl2303,\ + $(MODULES_DIR)/kernel/drivers/usb/serial/pl2303.ko \ +,CONFIG_USB_SERIAL_PL2303,kmod-usb-serial,61,pl2303)) + +$(eval $(call KMOD_template,USB_SERIAL_VISOR,usb-serial-visor,\ + $(MODULES_DIR)/kernel/drivers/usb/serial/visor.ko \ +,CONFIG_USB_SERIAL_VISOR,kmod-usb-serial,61,visor)) + +$(eval $(call KMOD_template,USB_STORAGE,usb-storage,\ + $(MODULES_DIR)/kernel/drivers/scsi/scsi_mod.ko \ + $(MODULES_DIR)/kernel/drivers/scsi/sd_mod.ko \ + $(MODULES_DIR)/kernel/drivers/usb/storage/usb-storage.ko \ +,CONFIG_USB_STORAGE,kmod-usb-core,60,scsi_mod sd_mod usb-storage)) + +$(eval $(call KMOD_template,USB_ATM,usb-atm,\ + $(MODULES_DIR)/kernel/drivers/usb/atm/usbatm.ko \ + ,CONFIG_USB_ATM,kmod-usb-atm,50,usbatm)) + +$(eval $(call KMOD_template,USB_ATM_SPEEDTOUCH,usb-atm-speedtouch,\ + $(MODULES_DIR)/kernel/drivers/usb/atm/speedtch.ko \ + ,CONFIG_USB_SPEEDTOUCH,kmod-usb-atm-speedtouch,50,speedtch)) + +# Misc. devices + +$(eval $(call KMOD_template,AX25,ax25,\ + $(MODULES_DIR)/kernel/net/ax25/ax25.ko \ + $(MODULES_DIR)/kernel/drivers/net/hamradio/mkiss.ko \ +,CONFIG_AX25,,90,ax25 mkiss)) + +$(eval $(call KMOD_template,BLUETOOTH,bluetooth,\ + $(MODULES_DIR)/kernel/net/bluetooth/bluetooth.ko \ + $(MODULES_DIR)/kernel/net/bluetooth/l2cap.ko \ + $(MODULES_DIR)/kernel/net/bluetooth/sco.ko \ + $(MODULES_DIR)/kernel/net/bluetooth/rfcomm/rfcomm.ko \ + $(MODULES_DIR)/kernel/drivers/bluetooth/hci_uart.ko \ + $(MODULES_DIR)/kernel/drivers/bluetooth/hci_usb.ko \ +,CONFIG_BT)) + + diff --git a/include/netfilter.mk b/include/netfilter.mk new file mode 100644 index 000000000..66cb747de --- /dev/null +++ b/include/netfilter.mk @@ -0,0 +1,116 @@ +# $Id: netfilter.mk 2411 2005-11-11 03:41:43Z nico $ + +ifeq ($(NF_2_6),1) +P_V4:=ipv4/netfilter/ +P_XT:=netfilter/ +else +P_V4:= +P_XT:= +endif + +IPT_CONNTRACK-m := +IPT_CONNTRACK-$(CONFIG_IP_NF_MATCH_CONNMARK) += $(P_V4)ipt_connmark +IPT_CONNTRACK-$(CONFIG_IP_NF_TARGET_CONNMARK) += $(P_V4)ipt_CONNMARK +IPT_CONNTRACK-$(CONFIG_IP_NF_MATCH_CONNTRACK) += $(P_V4)ipt_conntrack +IPT_CONNTRACK-$(CONFIG_IP_NF_MATCH_HELPER) += $(P_V4)ipt_helper +IPT_CONNTRACK-$(CONFIG_IP_NF_MATCH_STATE) += $(P_V4)ipt_state +IPT_CONNTRACK-$(CONFIG_NETFILTER_XT_MATCH_CONNTRACK) += $(P_XT)xt_conntrack +IPT_CONNTRACK-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += $(P_XT)xt_helper +IPT_CONNTRACK-$(CONFIG_NETFILTER_XT_MATCH_STATE) += $(P_XT)xt_state + + +IPT_EXTRA-m := +IPT_EXTRA-$(CONFIG_IP_NF_MATCH_CONDITION) += $(P_V4)ipt_condition +IPT_EXTRA-$(CONFIG_IP_NF_MATCH_CONNBYTES) += $(P_V4)ipt_connbytes +IPT_EXTRA-$(CONFIG_NETFILTER_XT_MATCH_CONNBYTES) += $(P_XT)xt_connbytes +IPT_EXTRA-$(CONFIG_IP_NF_MATCH_LIMIT) += $(P_V4)ipt_limit +IPT_EXTRA-$(CONFIG_NETFILTER_XT_MATCH_LIMIT) += $(P_XT)xt_limit +IPT_EXTRA-$(CONFIG_IP_NF_TARGET_LOG) += $(P_V4)ipt_LOG +IPT_EXTRA-$(CONFIG_IP_NF_MATCH_MULTIPORT) += $(P_XT)xt_multiport +IPT_EXTRA-$(CONFIG_NETFILTER_XT_MATCH_MULTIPORT) += $(P_XT)xt_multiport +IPT_EXTRA-$(CONFIG_IP_NF_MATCH_OWNER) += $(P_V4)ipt_owner +IPT_EXTRA-$(CONFIG_IP_NF_MATCH_PHYSDEV) += $(P_V4)ipt_physdev +IPT_EXTRA-$(CONFIG_IP_NF_MATCH_PKTTYPE) += $(P_V4)ipt_pkttype +IPT_EXTRA-$(CONFIG_NETFILTER_XT_MATCH_PKTTYPE) += $(P_XT)xt_pkttype +IPT_EXTRA-$(CONFIG_IP_NF_MATCH_QUOTA) += $(P_V4)ipt_quota +IPT_EXTRA-$(CONFIG_IP_NF_MATCH_RECENT) += $(P_V4)ipt_recent +IPT_EXTRA-$(CONFIG_IP_NF_TARGET_REJECT) += $(P_V4)ipt_REJECT +IPT_EXTRA-$(CONFIG_IP_NF_MATCH_STRING) += $(P_V4)ipt_string +IPT_EXTRA-$(CONFIG_NETFILTER_XT_MATCH_STRING) += $(P_XT)xt_string + +IPT_FILTER-m := +IPT_FILTER-$(CONFIG_IP_NF_MATCH_IPP2P) += $(P_V4)ipt_ipp2p +IPT_FILTER-$(CONFIG_IP_NF_MATCH_LAYER7) += $(P_V4)ipt_layer7 + +IPT_IMQ-m := +IPT_IMQ-$(CONFIG_IP_NF_TARGET_IMQ) += $(P_V4)ipt_IMQ + +IPT_IPOPT-m := +IPT_IPOPT-$(CONFIG_IP_NF_MATCH_DSCP) += $(P_V4)ipt_dscp +IPT_IPOPT-$(CONFIG_IP_NF_TARGET_DSCP) += $(P_V4)ipt_DSCP +IPT_IPOPT-$(CONFIG_IP_NF_MATCH_ECN) += $(P_V4)ipt_ecn +IPT_IPOPT-$(CONFIG_IP_NF_TARGET_ECN) += $(P_V4)ipt_ECN +IPT_IPOPT-$(CONFIG_IP_NF_MATCH_LENGTH) += $(P_V4)ipt_length +IPT_IPOPT-$(CONFIG_NETFILTER_XT_MATCH_LENGTH) += $(P_XT)xt_length +IPT_IPOPT-$(CONFIG_IP_NF_MATCH_MAC) += $(P_V4)ipt_mac +IPT_IPOPT-$(CONFIG_NETFILTER_XT_MATCH_MAC) += $(P_XT)xt_mac +IPT_IPOPT-$(CONFIG_IP_NF_MATCH_MARK) += $(P_V4)ipt_mark +IPT_IPOPT-$(CONFIG_NETFILTER_XT_MATCH_MARK) += $(P_XT)xt_mark +IPT_IPOPT-$(CONFIG_IP_NF_TARGET_MARK) += $(P_V4)ipt_MARK +IPT_IPOPT-$(CONFIG_NETFILTER_XT_TARGET_MARK) += $(P_XT)xt_MARK +IPT_IPOPT-$(CONFIG_IP_NF_MATCH_TCPMSS) += $(P_V4)ipt_tcpmss +IPT_IPOPT-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += $(P_XT)xt_tcpmss +IPT_IPOPT-$(CONFIG_IP_NF_TARGET_TCPMSS) += $(P_V4)ipt_TCPMSS +IPT_IPOPT-$(CONFIG_IP_NF_MATCH_TOS) += $(P_V4)ipt_tos +IPT_IPOPT-$(CONFIG_IP_NF_MATCH_TIME) += $(P_V4)ipt_time +IPT_IPOPT-$(CONFIG_IP_NF_TARGET_TOS) += $(P_V4)ipt_TOS +IPT_IPOPT-$(CONFIG_IP_NF_MATCH_TTL) += $(P_V4)ipt_ttl +IPT_IPOPT-$(CONFIG_IP_NF_TARGET_TTL) += $(P_V4)ipt_TTL +IPT_IPOPT-$(CONFIG_IP_NF_MATCH_UNCLEAN) += $(P_V4)ipt_unclean + +IPT_IPSEC-m := +IPT_IPSEC-$(CONFIG_IP_NF_MATCH_AH_ESP) += $(P_V4)ipt_ah $(P_V4)ipt_esp +IPT_IPSEC-$(CONFIG_IP_NF_MATCH_AH) += $(P_V4)ipt_ah +IPT_IPSEC-$(CONFIG_NETFILTER_XT_MATCH_ESP) += $(P_XT)xt_esp + +IPT_NAT-m := +IPT_NAT-$(CONFIG_IP_NF_NAT) += $(P_V4)ipt_SNAT $(P_V4)ipt_DNAT +IPT_NAT-$(CONFIG_IP_NF_TARGET_MASQUERADE) += $(P_V4)ipt_MASQUERADE +IPT_NAT-$(CONFIG_IP_NF_TARGET_MIRROR) += $(P_V4)ipt_MIRROR +IPT_NAT-$(CONFIG_IP_NF_TARGET_REDIRECT) += $(P_V4)ipt_REDIRECT + +IPT_NAT_EXTRA-m := +IPT_NAT_EXTRA-$(CONFIG_IP_NF_AMANDA) += $(P_V4)ip_conntrack_amanda +IPT_NAT_EXTRA-$(CONFIG_IP_NF_CT_PROTO_GRE) += $(P_V4)ip_conntrack_proto_gre +IPT_NAT_EXTRA-$(CONFIG_IP_NF_NAT_PROTO_GRE) += $(P_V4)ip_nat_proto_gre +IPT_NAT_EXTRA-$(CONFIG_IP_NF_H323) += $(P_V4)ip_conntrack_h323 +IPT_NAT_EXTRA-$(CONFIG_IP_NF_NAT_H323) += $(P_V4)ip_nat_h323 +IPT_NAT_EXTRA-$(CONFIG_IP_NF_MMS) += $(P_V4)ip_conntrack_mms +IPT_NAT_EXTRA-$(CONFIG_IP_NF_NAT_MMS) += $(P_V4)ip_nat_mms +IPT_NAT_EXTRA-$(CONFIG_IP_NF_RTSP) += $(P_V4)ip_conntrack_rtsp +IPT_NAT_EXTRA-$(CONFIG_IP_NF_NAT_RTSP) += $(P_V4)ip_nat_rtsp +IPT_NAT_EXTRA-$(CONFIG_IP_NF_PPTP) += $(P_V4)ip_conntrack_pptp +IPT_NAT_EXTRA-$(CONFIG_IP_NF_SIP) += $(P_V4)ip_conntrack_sip +IPT_NAT_EXTRA-$(CONFIG_IP_NF_NAT_PPTP) += $(P_V4)ip_nat_pptp +IPT_NAT_EXTRA-$(CONFIG_IP_NF_NAT_SIP) += $(P_V4)ip_nat_sip +IPT_NAT_EXTRA-$(CONFIG_IP_NF_NAT_SNMP_BASIC) += $(P_V4)ip_nat_snmp_basic +IPT_NAT_EXTRA-$(CONFIG_IP_NF_SIP) += $(P_V4)ip_conntrack_sip +IPT_NAT_EXTRA-$(CONFIG_IP_NF_NAT_SIP) += $(P_V4)ip_nat_sip +IPT_NAT_EXTRA-$(CONFIG_IP_NF_TFTP) += $(P_V4)ip_conntrack_tftp + +IPT_QUEUE-m := +IPT_QUEUE-$(CONFIG_IP_NF_QUEUE) += $(P_V4)ip_queue + +IPT_ULOG-m := +IPT_ULOG-$(CONFIG_IP_NF_TARGET_ULOG) += $(P_V4)ipt_ULOG + +IPT_BUILTIN := $(P_V4)ipt_standard +IPT_BUILTIN += $(P_V4)ipt_icmp $(P_V4)ipt_tcp $(P_V4)ipt_udp +IPT_BUILTIN += $(IPT_CONNTRACK-y) +IPT_BUILTIN += $(IPT_EXTRA-y) +IPT_BUILTIN += $(IPT_FILTER-y) +IPT_BUILTIN += $(IPT_IMQ-y) +IPT_BUILTIN += $(IPT_IPOPT-y) +IPT_BUILTIN += $(IPT_IPSEC-y) +IPT_BUILTIN += $(IPT_NAT-y) +IPT_BUILTIN += $(IPT_ULOG-y) diff --git a/include/package.mk b/include/package.mk new file mode 100644 index 000000000..82298b024 --- /dev/null +++ b/include/package.mk @@ -0,0 +1,300 @@ +ifneq ($(DUMP),) + all: dumpinfo +else + all: compile +endif + +define Build/DefaultTargets + ifeq ($(DUMP),) + ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) . $(TOPDIR)/package/rules.mk),$(PKG_BUILD_DIR)) + ifeq ($(CONFIG_AUTOREBUILD),y) + $(PKG_BUILD_DIR)/.prepared: package-clean + endif + endif + + ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg $(IPKG_$(1)) $(PKG_BUILD_DIR)),$(IPKG_$(1))) + ifeq ($(CONFIG_AUTOREBUILD),y) + $(PKG_BUILD_DIR)/.built: package-rebuild + endif + endif + endif + + + $(PKG_BUILD_DIR)/.prepared: + @-rm -rf $(PKG_BUILD_DIR) + @mkdir -p $(PKG_BUILD_DIR) + $(call Build/Prepare) + touch $$@ + + $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared + $(call Build/Configure) + touch $$@ + + $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured + $(call Build/Compile) + touch $$@ + + $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed: $(PKG_BUILD_DIR)/.built + $(call Build/InstallDev) + touch $$@ + + ifdef Build/InstallDev + compile-targets: $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed + endif + + package-clean: FORCE + $(call Build/Clean) + $(call Build/UninstallDev) + rm -f $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed + + package-rebuild: FORCE + @-rm -f $(PKG_BUILD_DIR)/.built + + define Build/DefaultTargets + endef +endef + +define Package/Default + CONFIGFILE:= + SECTION:=opt + CATEGORY:=Extra packages + DEPENDS:= + MAINTAINER:=OpenWrt Developers Team + SOURCE:=$(patsubst $(TOPDIR)/%,%,${shell pwd}) + ifneq ($(PKG_VERSION),) + ifneq ($(PKG_RELEASE),) + VERSION:=$(PKG_VERSION)-$(PKG_RELEASE) + else + VERSION:=$(PKG_VERSION) + endif + else + VERSION:=$(PKG_RELEASE) + endif + PKGARCH:=$(ARCH) + PRIORITY:=optional + DEFAULT:= + MENU:= + TITLE:= + DESCRIPTION:= +endef + +define BuildIPKGVariable +pkg_$(subst .,_,$(subst -,_,$(1)))_$(2) = $$(Package/$(1)/$(2)) +export pkg_$(subst .,_,$(subst -,_,$(1))_$(2)) +$(1)_COMMANDS += if [ -n "$$$$$$$$pkg_$(subst .,_,$(subst -,_,$(1)))_$(2)" ]; then echo "$$$$$$$$pkg_$(subst .,_,$(subst -,_,$(1)))_$(2)" > $(2); fi; +endef + +define BuildPackage + $(eval $(call Package/Default)) + $(eval $(call Package/$(1))) + + $(foreach FIELD, TITLE CATEGORY PRIORITY VERSION, + ifeq ($($(FIELD)),) + $$(error Package/$(1) is missing the $(FIELD) field) + endif + ) + + ifeq ($(PKGARCH),) + PKGARCH:=$(ARCH) + endif + + ifeq ($(DESCRIPTION),) + $(eval DESCRIPTION:=$(TITLE)) + endif + + IPKG_$(1):=$(PACKAGE_DIR)/$(1)_$(VERSION)_$(PKGARCH).ipk + IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg/$(1) + INFO_$(1):=$(IPKG_STATE_DIR)/info/$(1).list + + ifeq ($(CONFIG_PACKAGE_$(1)),y) + install-targets: $$(INFO_$(1)) + endif + + ifneq ($(CONFIG_PACKAGE_$(1))$(DEVELOPER),) + compile-targets: $$(IPKG_$(1)) + endif + + IDEPEND_$(1):=$$(strip $$(DEPENDS)) + + DUMPINFO += \ + echo "Package: $(1)"; + + ifneq ($(MENU),) + DUMPINFO += \ + echo "Menu: $(MENU)"; + endif + + ifneq ($(DEFAULT),) + DUMPINFO += \ + echo "Default: $(DEFAULT)"; + endif + + DUMPINFO += \ + echo "Version: $(VERSION)"; \ + echo "Depends: $$(IDEPEND_$(1))"; \ + echo "Build-Depends: $(PKG_BUILDDEP)"; \ + echo "Category: $(CATEGORY)"; \ + echo "Title: $(TITLE)"; \ + echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n,g'; + + ifneq ($(URL),) + DUMPINFO += \ + echo; \ + echo "$(URL)"; + endif + + DUMPINFO += \ + echo "@@"; + + ifneq ($(CONFIG),) + DUMPINFO += \ + echo "Config: $(CONFIG)" | sed -e 's,\\,\n,g'; \ + echo "@@"; + endif + + $(eval $(call BuildIPKGVariable,$(1),conffiles)) + $(eval $(call BuildIPKGVariable,$(1),preinst)) + $(eval $(call BuildIPKGVariable,$(1),postinst)) + $(eval $(call BuildIPKGVariable,$(1),prerm)) + $(eval $(call BuildIPKGVariable,$(1),postrm)) + $$(IDIR_$(1))/CONTROL/control: $(PKG_BUILD_DIR)/.prepared + mkdir -p $$(IDIR_$(1))/CONTROL + echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control + echo "Version: $(VERSION)" >> $$(IDIR_$(1))/CONTROL/control + ( \ + DEPENDS=; \ + for depend in $$(filter-out @%,$$(IDEPEND_$(1))); do \ + DEPENDS=$$$${DEPENDS:+$$$$DEPENDS, }$$$${depend##+}; \ + done; \ + echo "Depends: $$$$DEPENDS" >> $$(IDIR_$(1))/CONTROL/control; \ + ) + echo "Source: $(SOURCE)" >> $$(IDIR_$(1))/CONTROL/control + echo "Section: $(SECTION)" >> $$(IDIR_$(1))/CONTROL/control + echo "Priority: $(PRIORITY)" >> $$(IDIR_$(1))/CONTROL/control + echo "Maintainer: $(MAINTAINER)" >> $$(IDIR_$(1))/CONTROL/control + echo "Architecture: $(PKGARCH)" >> $$(IDIR_$(1))/CONTROL/control + echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n ,g' >> $$(IDIR_$(1))/CONTROL/control + chmod 644 $$(IDIR_$(1))/CONTROL/control + (cd $$(IDIR_$(1))/CONTROL; \ + $($(1)_COMMANDS) \ + ) + + $$(IPKG_$(1)): $$(IDIR_$(1))/CONTROL/control $(PKG_BUILD_DIR)/.built + $(call Package/$(1)/install,$$(IDIR_$(1))) + mkdir -p $(PACKAGE_DIR) + -find $$(IDIR_$(1)) -name CVS | xargs rm -rf + -find $$(IDIR_$(1)) -name .svn | xargs rm -rf + -find $$(IDIR_$(1)) -name '.#*' | xargs rm -f + $(RSTRIP) $$(IDIR_$(1)) + $(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR) + + $$(INFO_$(1)): $$(IPKG_$(1)) + $(IPKG) install $$(IPKG_$(1)) + + $(1)-clean: + rm -f $(PACKAGE_DIR)/$(1)_* + + clean: $(1)-clean + + $$(eval $$(call Build/DefaultTargets,$(1))) + +endef + +ifneq ($(strip $(PKG_CAT)),) + define Build/Prepare/Default + @if [ "$(PKG_CAT)" = "unzip" ]; then \ + unzip -d $(PKG_BUILD_DIR) $(DL_DIR)/$(PKG_SOURCE) ; \ + else \ + $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS) - ; \ + fi + @if [ -d ./patches ]; then \ + $(PATCH) $(PKG_BUILD_DIR) ./patches ; \ + fi + endef +endif + +define Build/Prepare + $(call Build/Prepare/Default) +endef + +define Build/Configure/Default + @(cd $(PKG_BUILD_DIR)/$(3); \ + [ -x configure ] && \ + $(2) \ + $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(TARGET_CFLAGS)" \ + CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ + LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ + ./configure \ + --target=$(GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ + --build=$(GNU_HOST_NAME) \ + --program-prefix="" \ + --program-suffix="" \ + --prefix=/usr \ + --exec-prefix=/usr \ + --bindir=/usr/bin \ + --sbindir=/usr/sbin \ + --libexecdir=/usr/lib \ + --sysconfdir=/etc \ + --datadir=/usr/share \ + --localstatedir=/var \ + --mandir=/usr/man \ + --infodir=/usr/info \ + $(DISABLE_NLS) \ + $(1); \ + true; \ + ) +endef + +define Build/Configure + $(call Build/Configure/Default,) +endef + +define Build/Compile/Default + $(MAKE) -C $(PKG_BUILD_DIR) \ + $(TARGET_CONFIGURE_OPTS) \ + CC=$(TARGET_CC) \ + CROSS="$(TARGET_CROSS)" \ + EXTRA_CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include" \ + ARCH="$(ARCH)" \ + $(1); +endef + +define Build/Compile + $(call Build/Compile/Default,) +endef + +ifneq ($(DUMP),) + dumpinfo: FORCE + @$(DUMPINFO) +else + $(PACKAGE_DIR): + mkdir -p $@ + + ifneq ($(strip $(PKG_SOURCE)),) + source: $(DL_DIR)/$(PKG_SOURCE) + + $(DL_DIR)/$(PKG_SOURCE): + mkdir -p $(DL_DIR) + $(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_SOURCE)" "$(PKG_MD5SUM)" $(PKG_SOURCE_URL) + + $(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE) + endif + + source: + prepare: $(PKG_BUILD_DIR)/.prepared + configure: $(PKG_BUILD_DIR)/.configured + + compile-targets: + compile: compile-targets + + install-targets: + install: install-targets + + clean-targets: + clean: FORCE + @$(MAKE) clean-targets + $(call Build/Clean) + rm -rf $(PKG_BUILD_DIR) +endif -- cgit v1.2.3 From 0b0afa4d818ec18187b09055fbb8d84a01590d6e Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 21 Jun 2006 02:32:39 +0000 Subject: add INCLUDE_DIR variable for $(TOPDIR)/include git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4033 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-build.mk | 2 +- include/modules-2.4.mk | 2 +- include/modules-2.6.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 9fbbe4504..fc62127ca 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -1,4 +1,4 @@ -include $(TOPDIR)/include/modules-$(KERNEL).mk +include $(INCLUDE_DIR)/modules-$(KERNEL).mk LINUX_SOURCE:=linux-$(LINUX_VERSION).tar.bz2 LINUX_SITE=http://www.us.kernel.org/pub/linux/kernel/v$(KERNEL) \ diff --git a/include/modules-2.4.mk b/include/modules-2.4.mk index 71864ad8e..553db0327 100644 --- a/include/modules-2.4.mk +++ b/include/modules-2.4.mk @@ -1,4 +1,4 @@ -include $(TOPDIR)/include/netfilter.mk +include $(INCLUDE_DIR)/netfilter.mk # Networking diff --git a/include/modules-2.6.mk b/include/modules-2.6.mk index ec9f5da44..aada707fb 100644 --- a/include/modules-2.6.mk +++ b/include/modules-2.6.mk @@ -1,5 +1,5 @@ NF_2_6:=1 -include $(TOPDIR)/include/netfilter.mk +include $(INCLUDE_DIR)/netfilter.mk # Networking -- cgit v1.2.3 From 94266d638908a140ef5cdd9b27d2eb367f97249f Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 21 Jun 2006 06:19:43 +0000 Subject: massive cleanup of toolchain/ git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4038 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/host-build.mk | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/package.mk | 13 +++--- 2 files changed, 121 insertions(+), 6 deletions(-) create mode 100644 include/host-build.mk (limited to 'include') diff --git a/include/host-build.mk b/include/host-build.mk new file mode 100644 index 000000000..0d103e2a0 --- /dev/null +++ b/include/host-build.mk @@ -0,0 +1,114 @@ +ifneq ($(strip $(PKG_CAT)),) + ifeq ($(PKG_CAT),unzip) + UNPACK=unzip -d $(PKG_BUILD_DIR) $(DL_DIR)/$(PKG_SOURCE) + else + UNPACK=$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS) - + endif + define Build/Prepare/Default + $(UNPACK) + @if [ -d ./patches ]; then \ + $(PATCH) $(PKG_BUILD_DIR) ./patches; \ + fi + endef +endif + +define Build/Prepare + $(call Build/Prepare/Default) +endef + +define Build/Configure/Default + @(cd $(PKG_BUILD_DIR)/$(3); \ + [ -x configure ] && \ + $(2) \ + CPPFLAGS="-I$(STAGING_DIR)/host/include" \ + LDFLAGS="-L$(STAGING_DIR)/host/lib" \ + ./configure \ + --target=$(GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ + --build=$(GNU_HOST_NAME) \ + --program-prefix="" \ + --program-suffix="" \ + --prefix=/usr \ + --exec-prefix=/usr \ + --bindir=/usr/bin \ + --sbindir=/usr/sbin \ + --libexecdir=/usr/lib \ + --sysconfdir=/etc \ + --datadir=/usr/share \ + --localstatedir=/var \ + --mandir=/usr/man \ + --infodir=/usr/info \ + $(DISABLE_NLS) \ + $(1); \ + true; \ + ) +endef + +define Build/Configure + $(call Build/Configure/Default) +endef + +define Build/Compile/Default + $(MAKE) -C $(PKG_BUILD_DIR) $(1) +endef + +define Build/Compile + $(call Build/Compile/Default) +endef + + +ifneq ($(strip $(PKG_SOURCE)),) + source: $(DL_DIR)/$(PKG_SOURCE) + + $(DL_DIR)/$(PKG_SOURCE): + mkdir -p $(DL_DIR) + $(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_SOURCE)" "$(PKG_MD5SUM)" $(PKG_SOURCE_URL) + + $(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE) +endif + +define HostBuild + $(PKG_BUILD_DIR)/.prepared: + @-rm -rf $(PKG_BUILD_DIR) + @mkdir -p $(PKG_BUILD_DIR) + $(call Build/Prepare) + touch $$@ + + $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared + $(call Build/Configure) + touch $$@ + + $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured + $(call Build/Compile) + touch $$@ + + $(STAGING_DIR)/stampfiles/.host_$(PKG_NAME)-installed: $(PKG_BUILD_DIR)/.built + $(call Build/Install) + touch $$@ + + ifdef Build/Install + install-targets: $(STAGING_DIR)/stampfiles/.host_$(PKG_NAME)-installed + endif + + package-clean: FORCE + $(call Build/Clean) + $(call Build/Uninstall) + rm -f $(STAGING_DIR)/stampfiles/.host_$(PKG_NAME)-installed + + source: + prepare: $(PKG_BUILD_DIR)/.prepared + configure: $(PKG_BUILD_DIR)/.configured + + compile-targets: $(PKG_BUILD_DIR)/.built + compile: compile-targets + + install-targets: + install: install-targets + + clean-targets: + clean: FORCE + @$(MAKE) clean-targets + $(call Build/Clean) + rm -rf $(PKG_BUILD_DIR) + +endef diff --git a/include/package.mk b/include/package.mk index 82298b024..9b863074f 100644 --- a/include/package.mk +++ b/include/package.mk @@ -201,14 +201,15 @@ define BuildPackage endef ifneq ($(strip $(PKG_CAT)),) + ifeq ($(PKG_CAT),unzip) + UNPACK=unzip -d $(PKG_BUILD_DIR) $(DL_DIR)/$(PKG_SOURCE) + else + UNPACK=$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS) - + endif define Build/Prepare/Default - @if [ "$(PKG_CAT)" = "unzip" ]; then \ - unzip -d $(PKG_BUILD_DIR) $(DL_DIR)/$(PKG_SOURCE) ; \ - else \ - $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS) - ; \ - fi + $(UNPACK) @if [ -d ./patches ]; then \ - $(PATCH) $(PKG_BUILD_DIR) ./patches ; \ + $(PATCH) $(PKG_BUILD_DIR) ./patches; \ fi endef endif -- cgit v1.2.3 From a8de4fb9f24fea095e80a3fcd5c69bd6029e39d2 Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 21 Jun 2006 14:02:29 +0000 Subject: move target/linux/image to target/image git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4040 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/target.mk | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 include/target.mk (limited to 'include') diff --git a/include/target.mk b/include/target.mk new file mode 100644 index 000000000..afdf5d8ae --- /dev/null +++ b/include/target.mk @@ -0,0 +1,23 @@ +define kernel_template +ifeq ($(CONFIG_LINUX_$(3)),y) +KERNEL:=$(1) +BOARD:=$(2) +endif +endef + +$(eval $(call kernel_template,2.4,brcm,2_4_BRCM)) +$(eval $(call kernel_template,2.4,ar7,2_4_AR7)) +$(eval $(call kernel_template,2.4,x86,2_4_X86)) +$(eval $(call kernel_template,2.6,brcm,2_6_BRCM)) +$(eval $(call kernel_template,2.6,rb532,2_6_RB532)) +$(eval $(call kernel_template,2.6,x86,2_6_X86)) +$(eval $(call kernel_template,2.4,ar531x,2_4_AR531X)) +$(eval $(call kernel_template,2.6,aruba,2_6_ARUBA)) +$(eval $(call kernel_template,2.6,au1000,2_6_AU1000)) +$(eval $(call kernel_template,2.6,xscale,2_6_XSCALE)) +$(eval $(call kernel_template,2.6,sibyte,2_6_SIBYTE)) + +export BOARD +export KERNEL + + -- cgit v1.2.3 From 826e52c483d9402f4b5b59a9f014d6edfc013885 Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 22 Jun 2006 00:59:47 +0000 Subject: add 0xdeadc0de to the jffs2 filesystem images git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4048 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/image.mk | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'include') diff --git a/include/image.mk b/include/image.mk index f30f0997e..bf80e2799 100644 --- a/include/image.mk +++ b/include/image.mk @@ -17,6 +17,10 @@ ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) $(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x10000 -o $(KDIR)/root.jffs2-64k -d $(BUILD_DIR)/root $(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x20000 -o $(KDIR)/root.jffs2-128k -d $(BUILD_DIR)/root + + # add End-of-Filesystem markers + echo -ne '\xde\xad\xc0\xde' >> $(KDIR)/root.jffs2-64k + echo -ne '\xde\xad\xc0\xde' >> $(KDIR)/root.jffs2-128k $(call Image/Build,jffs2-64k) $(call Image/Build,jffs2-128k) -- cgit v1.2.3 From c32af7bf6caa056f0026216645ec1a99d8dcf4bb Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 22 Jun 2006 01:00:13 +0000 Subject: remove stale reference to package/rules.mk - not that useful in the dependency handling anyway git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4049 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/package.mk b/include/package.mk index 9b863074f..cf8756ea6 100644 --- a/include/package.mk +++ b/include/package.mk @@ -6,7 +6,7 @@ endif define Build/DefaultTargets ifeq ($(DUMP),) - ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) . $(TOPDIR)/package/rules.mk),$(PKG_BUILD_DIR)) + ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) .),$(PKG_BUILD_DIR)) ifeq ($(CONFIG_AUTOREBUILD),y) $(PKG_BUILD_DIR)/.prepared: package-clean endif -- cgit v1.2.3 From 262b0cd565e8eaed38fb0f366570c063018dbc2b Mon Sep 17 00:00:00 2001 From: mbm Date: Fri, 23 Jun 2006 00:04:24 +0000 Subject: set defaults for .pkginfo git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4052 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/kernel.mk b/include/kernel.mk index 5c64ee4e1..849299802 100644 --- a/include/kernel.mk +++ b/include/kernel.mk @@ -1,7 +1,10 @@ +KERNEL:=kernel +BOARD:=board +LINUX_VERSION:=kernel + ifneq ($(DUMP),1) include $(TOPDIR)/.kernel.mk -KERNEL:=unknown ifneq (,$(findstring 2.4.,$(LINUX_VERSION))) KERNEL:=2.4 LINUX_KMOD_SUFFIX=o -- cgit v1.2.3 From 9dfcb239f2c42e3a9ef3eef0d675848be949ecf6 Mon Sep 17 00:00:00 2001 From: mbm Date: Fri, 23 Jun 2006 00:49:42 +0000 Subject: .pkginfo cleanup #2 git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4053 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-build.mk | 2 +- include/kernel.mk | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'include') diff --git a/include/kernel-build.mk b/include/kernel-build.mk index fc62127ca..d3c47281f 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -1,4 +1,4 @@ -include $(INCLUDE_DIR)/modules-$(KERNEL).mk +-include $(INCLUDE_DIR)/modules-$(KERNEL).mk LINUX_SOURCE:=linux-$(LINUX_VERSION).tar.bz2 LINUX_SITE=http://www.us.kernel.org/pub/linux/kernel/v$(KERNEL) \ diff --git a/include/kernel.mk b/include/kernel.mk index 849299802..c110f687a 100644 --- a/include/kernel.mk +++ b/include/kernel.mk @@ -1,9 +1,9 @@ -KERNEL:=kernel -BOARD:=board -LINUX_VERSION:=kernel - -ifneq ($(DUMP),1) -include $(TOPDIR)/.kernel.mk +ifeq ($(DUMP),1) + KERNEL:= + BOARD:= + LINUX_VERSION:= +else +-include $(TOPDIR)/.kernel.mk ifneq (,$(findstring 2.4.,$(LINUX_VERSION))) KERNEL:=2.4 -- cgit v1.2.3 From 5e79d66953f0bef849cafba752fca2fdb8fcdabc Mon Sep 17 00:00:00 2001 From: mbm Date: Fri, 23 Jun 2006 17:14:34 +0000 Subject: new verbose/trace script for make git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4057 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/verbose.mk | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 include/verbose.mk (limited to 'include') diff --git a/include/verbose.mk b/include/verbose.mk new file mode 100644 index 000000000..77a877efe --- /dev/null +++ b/include/verbose.mk @@ -0,0 +1,25 @@ +# OpenWrt.org 2006 +# $Id:$ + +ifeq ($(DUMP),) + ifndef KBUILD_VERBOSE + KBUILD_VERBOSE=0 + ifeq ("$(origin V)", "command line") + KBUILD_VERBOSE=$(V) + endif + endif + + ifeq ($(QUIET),1) + $(MAKECMDGOALS): trace + trace: FORCE + @[ -f "$(MAKECMDGOALS)" ] || { \ + [ -z "$${PWD##$$TOPDIR}" ] || DIR=" -C $${PWD##$$TOPDIR/}"; \ + echo -e "\33[33mmake[$$(($(MAKELEVEL)+1))]$$DIR $(MAKECMDGOALS)\33[m" >&3; \ + } + else + export QUIET:=1 + MAKE:=3>&1 4>&2 $(MAKE) + endif + + .SILENT: $(MAKECMDGOALS) +endif -- cgit v1.2.3 From 242527ccb9da3ac4cfe50969092a739c8b359321 Mon Sep 17 00:00:00 2001 From: mbm Date: Fri, 23 Jun 2006 21:47:24 +0000 Subject: switch on new verbose system git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4064 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/image.mk | 2 -- include/verbose.mk | 20 ++++++++++++++------ 2 files changed, 14 insertions(+), 8 deletions(-) (limited to 'include') diff --git a/include/image.mk b/include/image.mk index bf80e2799..ca0d688f1 100644 --- a/include/image.mk +++ b/include/image.mk @@ -1,5 +1,3 @@ -include $(TOPDIR)/rules.mk - KDIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD) ifneq ($(CONFIG_BIG_ENDIAN),y) diff --git a/include/verbose.mk b/include/verbose.mk index 77a877efe..31e0cea1b 100644 --- a/include/verbose.mk +++ b/include/verbose.mk @@ -1,14 +1,19 @@ # OpenWrt.org 2006 # $Id:$ -ifeq ($(DUMP),) - ifndef KBUILD_VERBOSE - KBUILD_VERBOSE=0 - ifeq ("$(origin V)", "command line") - KBUILD_VERBOSE=$(V) - endif +ifndef KBUILD_VERBOSE + ifeq ($(DUMP),) + KBUILD_VERBOSE=1 + else + KBUILD_VERBOSE=99 + endif + ifeq ("$(origin V)", "command line") + KBUILD_VERBOSE=$(V) endif +endif + +ifneq ($(KBUILD_VERBOSE),99) ifeq ($(QUIET),1) $(MAKECMDGOALS): trace trace: FORCE @@ -18,6 +23,9 @@ ifeq ($(DUMP),) } else export QUIET:=1 + ifeq ($(KBUILD_VERBOSE),0) + MAKE:=&>/dev/null $(MAKE) + endif MAKE:=3>&1 4>&2 $(MAKE) endif -- cgit v1.2.3 From 04ee4e2bdb23481197aa5b890d8c89cd4409e9f1 Mon Sep 17 00:00:00 2001 From: mbm Date: Fri, 23 Jun 2006 22:10:43 +0000 Subject: fix kernel configure target git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4065 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-build.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'include') diff --git a/include/kernel-build.mk b/include/kernel-build.mk index d3c47281f..dfd422744 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -97,9 +97,8 @@ pkg-install: FORCE @{ [ "$(INSTALL_TARGETS)" != "" ] && $(IPKG) install $(INSTALL_TARGETS) || true; } source: $(DL_DIR)/$(LINUX_SOURCE) -prepare: +prepare: $(LINUX_DIR)/.configured @mkdir -p $(STAMP_DIR) $(PACKAGE_DIR) - @$(MAKE) $(LINUX_DIR)/.configured compile: prepare $(STAMP_DIR)/.linux-compile -- cgit v1.2.3 From 3c1c55a3bc769582005ca7fd1727d1e114d61c48 Mon Sep 17 00:00:00 2001 From: mbm Date: Fri, 23 Jun 2006 22:20:05 +0000 Subject: set default verbosity to 0 git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4066 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/verbose.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/verbose.mk b/include/verbose.mk index 31e0cea1b..1ef403ccf 100644 --- a/include/verbose.mk +++ b/include/verbose.mk @@ -3,7 +3,7 @@ ifndef KBUILD_VERBOSE ifeq ($(DUMP),) - KBUILD_VERBOSE=1 + KBUILD_VERBOSE=0 else KBUILD_VERBOSE=99 endif -- cgit v1.2.3 From 594722a4093c9ea95a8718591971d67a0bd7565d Mon Sep 17 00:00:00 2001 From: mbm Date: Fri, 23 Jun 2006 22:46:07 +0000 Subject: prevent verbose script from corrupting .pkginfo git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4067 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/verbose.mk | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'include') diff --git a/include/verbose.mk b/include/verbose.mk index 1ef403ccf..6d7c7ef6c 100644 --- a/include/verbose.mk +++ b/include/verbose.mk @@ -2,17 +2,12 @@ # $Id:$ ifndef KBUILD_VERBOSE - ifeq ($(DUMP),) - KBUILD_VERBOSE=0 - else - KBUILD_VERBOSE=99 - endif + KBUILD_VERBOSE=0 ifeq ("$(origin V)", "command line") KBUILD_VERBOSE=$(V) endif endif - ifneq ($(KBUILD_VERBOSE),99) ifeq ($(QUIET),1) $(MAKECMDGOALS): trace @@ -23,6 +18,7 @@ ifneq ($(KBUILD_VERBOSE),99) } else export QUIET:=1 + NO_TRACE_MAKE:=$(MAKE) V=99 ifeq ($(KBUILD_VERBOSE),0) MAKE:=&>/dev/null $(MAKE) endif -- cgit v1.2.3 From 5bd73a12052f8e9182ac1f51372cf6d0323f9dad Mon Sep 17 00:00:00 2001 From: nbd Date: Sun, 25 Jun 2006 16:05:43 +0000 Subject: move the broadcom driver stuff into its own submenu git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4073 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/package.mk | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'include') diff --git a/include/package.mk b/include/package.mk index cf8756ea6..0996574d2 100644 --- a/include/package.mk +++ b/include/package.mk @@ -74,6 +74,7 @@ define Package/Default PRIORITY:=optional DEFAULT:= MENU:= + SUBMENU:= TITLE:= DESCRIPTION:= endef @@ -124,6 +125,11 @@ define BuildPackage echo "Menu: $(MENU)"; endif + ifneq ($(SUBMENU),) + DUMPINFO += \ + echo "Submenu: $(SUBMENU)"; + endif + ifneq ($(DEFAULT),) DUMPINFO += \ echo "Default: $(DEFAULT)"; -- cgit v1.2.3 From e73df5567cc022dcbc5e11975886e799fcfb2f72 Mon Sep 17 00:00:00 2001 From: nbd Date: Sun, 25 Jun 2006 16:59:19 +0000 Subject: add extra targets to improve make tracing output git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4078 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-build.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/kernel-build.mk b/include/kernel-build.mk index dfd422744..706764db5 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -8,6 +8,7 @@ LINUX_SITE=http://www.us.kernel.org/pub/linux/kernel/v$(KERNEL) \ KERNEL_IDIR:=$(KERNEL_BUILD_DIR)/kernel-ipkg KERNEL_IPKG:=$(KERNEL_BUILD_DIR)/kernel_$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)_$(ARCH).ipk +TARGETS += $(KERNEL_IPKG) INSTALL_TARGETS += $(KERNEL_IPKG) $(TARGETS): $(PACKAGE_DIR) @@ -74,8 +75,12 @@ $(LINUX_DIR)/.modules_done: $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install touch $(LINUX_DIR)/.modules_done +modules: $(LINUX_DIR)/.modules_done +packages: $(TARGETS) + $(STAMP_DIR)/.linux-compile: - @$(MAKE) $(LINUX_DIR)/.modules_done $(TARGETS) $(KERNEL_IPKG) + @$(MAKE) modules + @$(MAKE) packages ln -sf $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) $(BUILD_DIR)/linux touch $@ -- cgit v1.2.3 From 77aeb32a1d3d514d184d8911f801fa1e2d26bf0d Mon Sep 17 00:00:00 2001 From: nico Date: Sun, 25 Jun 2006 21:37:07 +0000 Subject: fix inclusion of kernel modules selected for install in images (closes: #598). git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4081 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/kernel.mk b/include/kernel.mk index c110f687a..b40f65f48 100644 --- a/include/kernel.mk +++ b/include/kernel.mk @@ -47,10 +47,10 @@ PKG_$(1) := $(PACKAGE_DIR)/kmod-$(2)_$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)_ I_$(1) := $(KMOD_BUILD_DIR)/ipkg/$(2) ifeq ($$(KDEPEND_$(1)),m) -ifneq ($(CONFIG_PACKAGE_KMOD_$(1)),) +ifneq ($$(CONFIG_PACKAGE_KMOD_$(1)),) TARGETS += $$(PKG_$(1)) endif -ifeq ($(CONFIG_PACKAGE_KMOD_$(1)),y) +ifeq ($$(CONFIG_PACKAGE_KMOD_$(1)),y) INSTALL_TARGETS += $$(PKG_$(1)) endif endif -- cgit v1.2.3 From 539e5f19d6bc417179b729466077adb6fc449720 Mon Sep 17 00:00:00 2001 From: nbd Date: Mon, 26 Jun 2006 01:55:47 +0000 Subject: add support for new modules.mk format (no autogenerated Config.in yet) git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4083 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-build.mk | 90 +++++++++++++++++++++++++++++++++++++++++++++++++ include/modules-2.4.mk | 5 --- include/modules-2.6.mk | 5 --- include/modules.mk | 27 +++++++++++++++ 4 files changed, 117 insertions(+), 10 deletions(-) create mode 100644 include/modules.mk (limited to 'include') diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 706764db5..3a455a812 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -127,3 +127,93 @@ clean: FORCE rm -f $(STAMP_DIR)/.linux-compile rm -rf $(KERNEL_BUILD_DIR) rm -f $(TARGETS) + + +define AutoLoad +add_module $(1) "$(2)"; +endef + +define KernelPackage/Defaults + VERSION:=$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE) + DEPENDS:= + MAINTAINER:=OpenWrt Developers Team + SOURCE:=$(patsubst $(TOPDIR)/%,%,${shell pwd}) + PKGARCH:=$(ARCH) + PRIORITY:=optional + KCONFIG:= + FILES:= + BUILD:= + MODULES:= + TITLE:= + DESCRIPTION:= +endef + +define KernelPackage + NAME:=$(1) + $(eval $(call KernelPackage/Defaults)) + $(eval $(call KernelPackage/$(1))) + $(eval $(call KernelPackage/$(1)/$(KERNEL))) + + PKG_$(1) := $(PACKAGE_DIR)/kmod-$(1)_$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)_$(ARCH).ipk + I_$(1) := $(KMOD_BUILD_DIR)/ipkg/$(1) + + IDEPEND_$(1):='kernel ($(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE))' $(DEPENDS) + + ifeq ($$(strip $(KCONFIG)),) + KDEPEND_$(1):=m + else + KDEPEND_$(1):=$($(KCONFIG)) + endif + ifeq ($$(KDEPEND_$(1)),m) + ifneq ($(CONFIG_PACKAGE_kmod-$(1)),) + packages: $$(PKG_$(1)) + endif + ifeq ($(CONFIG_PACKAGE_kmod-$(1)),y) + install-kmod-$(1): FORCE + $(IPKG) install $$(PKG_$(1)) + pkg-install: install-kmod-$(1) + endif + endif + + $$(PKG_$(1)): $(LINUX_DIR)/.modules_done + rm -rf $$(I_$(1)) + install -d -m0755 $$(I_$(1))/CONTROL + echo "Package: kmod-$(1)" > $$(I_$(1))/CONTROL/control + echo "Version: $(VERSION)" >> $$(I_$(1))/CONTROL/control + ( \ + DEPENDS=; \ + for depend in $$(filter-out @%,$$(IDEPEND_$(1))); do \ + DEPENDS=$$$${DEPENDS:+$$$$DEPENDS, }$$$${depend##+}; \ + done; \ + echo "Depends: $$$$DEPENDS" >> $$(I_$(1))/CONTROL/control; \ + ) + echo "Source: $(SOURCE)" >> $$(I_$(1))/CONTROL/control + echo "Section: kernel" >> $$(I_$(1))/CONTROL/control + echo "Priority: $(PRIORITY)" >> $$(I_$(1))/CONTROL/control + echo "Maintainer: $(MAINTAINER)" >> $$(I_$(1))/CONTROL/control + echo "Architecture: $(PKGARCH)" >> $$(I_$(1))/CONTROL/control + echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n ,g' >> $$(I_$(1))/CONTROL/control + ifneq ($(strip $(FILES)),) + mkdir -p $$(I_$(1))/lib/modules/$(LINUX_VERSION) + $(CP) $(FILES) $$(I_$(1))/lib/modules/$(LINUX_VERSION)/ + endif + ifneq ($(MODULES),) + export modules=; \ + add_module() { \ + mkdir -p $$(I_$(1))/etc/modules.d; \ + echo "$$$$2" > $$(I_$(1))/etc/modules.d/$$$$1-$(1); \ + modules="$$$${modules:+$$$$modules }$$$$1-$(1)"; \ + }; \ + $(MODULES) \ + mkdir -p $$(I_$(1))/etc/modules.d; \ + echo "#!/bin/sh" >> $$(I_$(1))/CONTROL/postinst; \ + echo "[ -z \"\$$$$IPKG_INSTROOT\" ] || exit" >> $$(I_$(1))/CONTROL/postinst; \ + echo ". /etc/functions.sh" >> $$(I_$(1))/CONTROL/postinst; \ + echo "load_modules $$$$modules" >> $$(I_$(1))/CONTROL/postinst; \ + chmod 0755 $$(I_$(1))/CONTROL/postinst; + endif + $(IPKG_BUILD) $$(I_$(1)) $(PACKAGE_DIR) +endef + +-include $(INCLUDE_DIR)/modules.mk + diff --git a/include/modules-2.4.mk b/include/modules-2.4.mk index 553db0327..325cf16bc 100644 --- a/include/modules-2.4.mk +++ b/include/modules-2.4.mk @@ -107,11 +107,6 @@ $(eval $(call KMOD_template,IP6TABLES,ip6tables,\ # Block devices -$(eval $(call KMOD_template,IDE,ide,\ - $(MODULES_DIR)/kernel/drivers/ide/*.o \ - $(MODULES_DIR)/kernel/drivers/ide/*/*.o \ -,CONFIG_IDE,,20,pdc202xx_old ide-core ide-detect ide-disk)) - $(eval $(call KMOD_template,LOOP,loop,\ $(MODULES_DIR)/kernel/drivers/block/loop.o \ ,CONFIG_BLK_DEV_LOOP,,20,loop)) diff --git a/include/modules-2.6.mk b/include/modules-2.6.mk index aada707fb..6e8a2ded7 100644 --- a/include/modules-2.6.mk +++ b/include/modules-2.6.mk @@ -112,11 +112,6 @@ $(eval $(call KMOD_template,IP6TABLES,ip6tables,\ # Block devices -$(eval $(call KMOD_template,IDE,ide,\ - $(MODULES_DIR)/kernel/drivers/ide/*.ko \ - $(MODULES_DIR)/kernel/drivers/ide/*/*.ko \ -,CONFIG_IDE)) - $(eval $(call KMOD_template,LOOP,loop,\ $(MODULES_DIR)/kernel/drivers/block/loop.ko \ ,CONFIG_BLK_DEV_LOOP,,20,loop)) diff --git a/include/modules.mk b/include/modules.mk new file mode 100644 index 000000000..026c4a610 --- /dev/null +++ b/include/modules.mk @@ -0,0 +1,27 @@ +include $(TOPDIR)/include/kernel.mk + +define KernelPackage/ide-core +TITLE:=Kernel support for IDE +DESCRIPTION:=Kernel modules for IDE support\\\ + useful for usb mass storage devices (e.g. on WL-HDD)\\\ + \\\ + Includes: \\\ + - ide-core \\\ + - ide-detect \\\ + - ide-disk \\\ + - pdc202xx_old +KCONFIG:=CONFIG_IDE +FILES:=$(MODULES_DIR)/kernel/drivers/ide/*.$(LINUX_KMOD_SUFFIX) +MODULES:=$(call AutoLoad,20,ide-core) $(call AutoLoad,90,ide-detect ide-disk) +endef +$(eval $(call KernelPackage,ide-core)) + +define KernelPackage/ide-pdc202xx +TITLE:=PDC202xx IDE driver +DESCRIPTION:=PDC202xx IDE driver +KCONFIG:=CONFIG_BLK_DEV_PDC202XX_OLD +FILES:=$(MODULES_DIR)/kernel/drivers/ide/pci/pdc202xx_old.$(LINUX_KMOD_SUFFIX) +MODULES:=$(call AutoLoad,30,pdc202xx_old) +endef +$(eval $(call KernelPackage,ide-pdc202xx)) + -- cgit v1.2.3 From 02cdebbb91a33d8e24da1c94a9d93ac39be168a7 Mon Sep 17 00:00:00 2001 From: mbm Date: Tue, 27 Jun 2006 00:35:46 +0000 Subject: credit where credit is due git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4091 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/host-build.mk | 6 ++++++ include/image.mk | 6 ++++++ include/kernel-build.mk | 6 ++++++ include/kernel.mk | 6 ++++++ include/modules-2.4.mk | 6 ++++++ include/modules-2.6.mk | 6 ++++++ include/modules.mk | 6 ++++++ include/netfilter.mk | 6 ++++++ include/package.mk | 6 ++++++ include/target.mk | 6 ++++++ include/verbose.mk | 7 ++++++- 11 files changed, 66 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/host-build.mk b/include/host-build.mk index 0d103e2a0..43c83142d 100644 --- a/include/host-build.mk +++ b/include/host-build.mk @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# ifneq ($(strip $(PKG_CAT)),) ifeq ($(PKG_CAT),unzip) UNPACK=unzip -d $(PKG_BUILD_DIR) $(DL_DIR)/$(PKG_SOURCE) diff --git a/include/image.mk b/include/image.mk index ca0d688f1..95accd6e1 100644 --- a/include/image.mk +++ b/include/image.mk @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# KDIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD) ifneq ($(CONFIG_BIG_ENDIAN),y) diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 3a455a812..6fae4acc5 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# -include $(INCLUDE_DIR)/modules-$(KERNEL).mk LINUX_SOURCE:=linux-$(LINUX_VERSION).tar.bz2 diff --git a/include/kernel.mk b/include/kernel.mk index b40f65f48..2c5d09377 100644 --- a/include/kernel.mk +++ b/include/kernel.mk @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# ifeq ($(DUMP),1) KERNEL:= BOARD:= diff --git a/include/modules-2.4.mk b/include/modules-2.4.mk index 325cf16bc..f8d966f40 100644 --- a/include/modules-2.4.mk +++ b/include/modules-2.4.mk @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# include $(INCLUDE_DIR)/netfilter.mk # Networking diff --git a/include/modules-2.6.mk b/include/modules-2.6.mk index 6e8a2ded7..c98e4ea8a 100644 --- a/include/modules-2.6.mk +++ b/include/modules-2.6.mk @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# NF_2_6:=1 include $(INCLUDE_DIR)/netfilter.mk diff --git a/include/modules.mk b/include/modules.mk index 026c4a610..d20fd41bb 100644 --- a/include/modules.mk +++ b/include/modules.mk @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# include $(TOPDIR)/include/kernel.mk define KernelPackage/ide-core diff --git a/include/netfilter.mk b/include/netfilter.mk index 66cb747de..236d4b242 100644 --- a/include/netfilter.mk +++ b/include/netfilter.mk @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# # $Id: netfilter.mk 2411 2005-11-11 03:41:43Z nico $ ifeq ($(NF_2_6),1) diff --git a/include/package.mk b/include/package.mk index 0996574d2..bf2376dcd 100644 --- a/include/package.mk +++ b/include/package.mk @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# ifneq ($(DUMP),) all: dumpinfo else diff --git a/include/target.mk b/include/target.mk index afdf5d8ae..5a87ab84d 100644 --- a/include/target.mk +++ b/include/target.mk @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# define kernel_template ifeq ($(CONFIG_LINUX_$(3)),y) KERNEL:=$(1) diff --git a/include/verbose.mk b/include/verbose.mk index 6d7c7ef6c..98dfd5632 100644 --- a/include/verbose.mk +++ b/include/verbose.mk @@ -1,4 +1,9 @@ -# OpenWrt.org 2006 +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# # $Id:$ ifndef KBUILD_VERBOSE -- cgit v1.2.3 From bc1c3a84e0db1f99afcff8d95d961cd3877a79a3 Mon Sep 17 00:00:00 2001 From: mbm Date: Tue, 27 Jun 2006 23:52:30 +0000 Subject: minor changes git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4096 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/verbose.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/verbose.mk b/include/verbose.mk index 98dfd5632..c998b3d1c 100644 --- a/include/verbose.mk +++ b/include/verbose.mk @@ -27,7 +27,7 @@ ifneq ($(KBUILD_VERBOSE),99) ifeq ($(KBUILD_VERBOSE),0) MAKE:=&>/dev/null $(MAKE) endif - MAKE:=3>&1 4>&2 $(MAKE) + MAKE:=cmd() { $(MAKE) $$* || { echo "Build failed. Please re-run make with V=99 to see what's going on"; /bin/false; } } 3>&1 4>&2; cmd endif .SILENT: $(MAKECMDGOALS) -- cgit v1.2.3 From f07fb572b6130ce2a4fda134983bc328a4e22c2e Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 28 Jun 2006 17:30:39 +0000 Subject: add workaround for kernel module install git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4098 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-build.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 6fae4acc5..55a74701c 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -105,7 +105,9 @@ $(TOPDIR)/.kernel.mk: echo "LINUX_RELEASE:=$(LINUX_RELEASE)" >> $@ pkg-install: FORCE - @{ [ "$(INSTALL_TARGETS)" != "" ] && $(IPKG) install $(INSTALL_TARGETS) || true; } + @for pkg in $(INSTALL_TARGETS); do \ + $(IPKG) install $$pkg || echo; \ + done source: $(DL_DIR)/$(LINUX_SOURCE) prepare: $(LINUX_DIR)/.configured -- cgit v1.2.3 From b09cd08eaff61c7f1cfb33806e8c0fd1c41a3739 Mon Sep 17 00:00:00 2001 From: nbd Date: Sun, 2 Jul 2006 00:56:53 +0000 Subject: always set NO_TRACE_MAKE git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4104 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/verbose.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/verbose.mk b/include/verbose.mk index c998b3d1c..be7d5f76b 100644 --- a/include/verbose.mk +++ b/include/verbose.mk @@ -6,6 +6,8 @@ # # $Id:$ +NO_TRACE_MAKE:=$(MAKE) V=99 + ifndef KBUILD_VERBOSE KBUILD_VERBOSE=0 ifeq ("$(origin V)", "command line") @@ -23,7 +25,6 @@ ifneq ($(KBUILD_VERBOSE),99) } else export QUIET:=1 - NO_TRACE_MAKE:=$(MAKE) V=99 ifeq ($(KBUILD_VERBOSE),0) MAKE:=&>/dev/null $(MAKE) endif -- cgit v1.2.3 From fbccb3271a30134bd25ea3d17804c21b8dfdf224 Mon Sep 17 00:00:00 2001 From: florian Date: Sun, 9 Jul 2006 10:08:28 +0000 Subject: Add missing brcm63xx-2.6 target to the target list git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4120 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/target.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/target.mk b/include/target.mk index 5a87ab84d..44ff11128 100644 --- a/include/target.mk +++ b/include/target.mk @@ -15,6 +15,7 @@ $(eval $(call kernel_template,2.4,brcm,2_4_BRCM)) $(eval $(call kernel_template,2.4,ar7,2_4_AR7)) $(eval $(call kernel_template,2.4,x86,2_4_X86)) $(eval $(call kernel_template,2.6,brcm,2_6_BRCM)) +$(eval $(call kernel_template,2.6,brcm63xx,2_6_BRCM63XX)) $(eval $(call kernel_template,2.6,rb532,2_6_RB532)) $(eval $(call kernel_template,2.6,x86,2_6_X86)) $(eval $(call kernel_template,2.4,ar531x,2_4_AR531X)) -- cgit v1.2.3 From 2b9c94e12d0b9aaffc59914fe951fccb269cbb1c Mon Sep 17 00:00:00 2001 From: mbm Date: Mon, 10 Jul 2006 16:51:59 +0000 Subject: fix broken .pkginfo under certain situations git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4122 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/verbose.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include') diff --git a/include/verbose.mk b/include/verbose.mk index be7d5f76b..da2a21974 100644 --- a/include/verbose.mk +++ b/include/verbose.mk @@ -32,4 +32,6 @@ ifneq ($(KBUILD_VERBOSE),99) endif .SILENT: $(MAKECMDGOALS) +else + NO_TRACE_MAKE:=$(MAKE) endif -- cgit v1.2.3 From e9437d222f86a8960af081199fbef41312c7770b Mon Sep 17 00:00:00 2001 From: mbm Date: Mon, 10 Jul 2006 21:17:45 +0000 Subject: add a new FORCEREBUILD option to Package/ to force a package to be rebuilt each time make is run git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4123 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/package.mk | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'include') diff --git a/include/package.mk b/include/package.mk index bf2376dcd..618c3c555 100644 --- a/include/package.mk +++ b/include/package.mk @@ -121,6 +121,10 @@ define BuildPackage compile-targets: $$(IPKG_$(1)) endif + ifeq ($(FORCEREBUILD),y) + $$(IPKG_$(1)): FORCE + endif + IDEPEND_$(1):=$$(strip $$(DEPENDS)) DUMPINFO += \ -- cgit v1.2.3 From e7359513bec031e2a0d5c38fa8e9b5fd3cd2ab40 Mon Sep 17 00:00:00 2001 From: mbm Date: Mon, 10 Jul 2006 23:21:08 +0000 Subject: rebuild ipkg control files if Makefile changes git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4124 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/package.mk b/include/package.mk index 618c3c555..7aea314ab 100644 --- a/include/package.mk +++ b/include/package.mk @@ -173,7 +173,7 @@ define BuildPackage $(eval $(call BuildIPKGVariable,$(1),postinst)) $(eval $(call BuildIPKGVariable,$(1),prerm)) $(eval $(call BuildIPKGVariable,$(1),postrm)) - $$(IDIR_$(1))/CONTROL/control: $(PKG_BUILD_DIR)/.prepared + $$(IDIR_$(1))/CONTROL/control: Makefile $(PKG_BUILD_DIR)/.prepared mkdir -p $$(IDIR_$(1))/CONTROL echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control echo "Version: $(VERSION)" >> $$(IDIR_$(1))/CONTROL/control -- cgit v1.2.3 From 1f181fae00a9879130ce21ee28c3035773aba744 Mon Sep 17 00:00:00 2001 From: nbd Date: Tue, 18 Jul 2006 15:31:01 +0000 Subject: check if the Package/$(NAME) template is defined before packaging or installing ipkg packages git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4144 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/package.mk | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'include') diff --git a/include/package.mk b/include/package.mk index 7aea314ab..2784cc888 100644 --- a/include/package.mk +++ b/include/package.mk @@ -65,6 +65,7 @@ define Package/Default SECTION:=opt CATEGORY:=Extra packages DEPENDS:= + EXTRA_DEPENDS:= MAINTAINER:=OpenWrt Developers Team SOURCE:=$(patsubst $(TOPDIR)/%,%,${shell pwd}) ifneq ($(PKG_VERSION),) @@ -113,12 +114,14 @@ define BuildPackage IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg/$(1) INFO_$(1):=$(IPKG_STATE_DIR)/info/$(1).list - ifeq ($(CONFIG_PACKAGE_$(1)),y) - install-targets: $$(INFO_$(1)) - endif + ifdef Package/$(1)/install + ifeq ($(CONFIG_PACKAGE_$(1)),y) + install-targets: $$(INFO_$(1)) + endif - ifneq ($(CONFIG_PACKAGE_$(1))$(DEVELOPER),) - compile-targets: $$(IPKG_$(1)) + ifneq ($(CONFIG_PACKAGE_$(1))$(DEVELOPER),) + compile-targets: $$(IPKG_$(1)) + endif endif ifeq ($(FORCEREBUILD),y) @@ -182,7 +185,7 @@ define BuildPackage for depend in $$(filter-out @%,$$(IDEPEND_$(1))); do \ DEPENDS=$$$${DEPENDS:+$$$$DEPENDS, }$$$${depend##+}; \ done; \ - echo "Depends: $$$$DEPENDS" >> $$(IDIR_$(1))/CONTROL/control; \ + echo "Depends: $(EXTRA_DEPENDS) $$$$DEPENDS" >> $$(IDIR_$(1))/CONTROL/control; \ ) echo "Source: $(SOURCE)" >> $$(IDIR_$(1))/CONTROL/control echo "Section: $(SECTION)" >> $$(IDIR_$(1))/CONTROL/control -- cgit v1.2.3 From 3cb6e4ad50c7d3935da161273c093992534b5a0e Mon Sep 17 00:00:00 2001 From: nbd Date: Tue, 18 Jul 2006 16:17:19 +0000 Subject: move some of the kernel module packaging to package/kernel/ git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4146 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-build.mk | 89 ------------------------------------------------- include/modules.mk | 33 ------------------ 2 files changed, 122 deletions(-) delete mode 100644 include/modules.mk (limited to 'include') diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 55a74701c..942a91516 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -136,92 +136,3 @@ clean: FORCE rm -rf $(KERNEL_BUILD_DIR) rm -f $(TARGETS) - -define AutoLoad -add_module $(1) "$(2)"; -endef - -define KernelPackage/Defaults - VERSION:=$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE) - DEPENDS:= - MAINTAINER:=OpenWrt Developers Team - SOURCE:=$(patsubst $(TOPDIR)/%,%,${shell pwd}) - PKGARCH:=$(ARCH) - PRIORITY:=optional - KCONFIG:= - FILES:= - BUILD:= - MODULES:= - TITLE:= - DESCRIPTION:= -endef - -define KernelPackage - NAME:=$(1) - $(eval $(call KernelPackage/Defaults)) - $(eval $(call KernelPackage/$(1))) - $(eval $(call KernelPackage/$(1)/$(KERNEL))) - - PKG_$(1) := $(PACKAGE_DIR)/kmod-$(1)_$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)_$(ARCH).ipk - I_$(1) := $(KMOD_BUILD_DIR)/ipkg/$(1) - - IDEPEND_$(1):='kernel ($(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE))' $(DEPENDS) - - ifeq ($$(strip $(KCONFIG)),) - KDEPEND_$(1):=m - else - KDEPEND_$(1):=$($(KCONFIG)) - endif - ifeq ($$(KDEPEND_$(1)),m) - ifneq ($(CONFIG_PACKAGE_kmod-$(1)),) - packages: $$(PKG_$(1)) - endif - ifeq ($(CONFIG_PACKAGE_kmod-$(1)),y) - install-kmod-$(1): FORCE - $(IPKG) install $$(PKG_$(1)) - pkg-install: install-kmod-$(1) - endif - endif - - $$(PKG_$(1)): $(LINUX_DIR)/.modules_done - rm -rf $$(I_$(1)) - install -d -m0755 $$(I_$(1))/CONTROL - echo "Package: kmod-$(1)" > $$(I_$(1))/CONTROL/control - echo "Version: $(VERSION)" >> $$(I_$(1))/CONTROL/control - ( \ - DEPENDS=; \ - for depend in $$(filter-out @%,$$(IDEPEND_$(1))); do \ - DEPENDS=$$$${DEPENDS:+$$$$DEPENDS, }$$$${depend##+}; \ - done; \ - echo "Depends: $$$$DEPENDS" >> $$(I_$(1))/CONTROL/control; \ - ) - echo "Source: $(SOURCE)" >> $$(I_$(1))/CONTROL/control - echo "Section: kernel" >> $$(I_$(1))/CONTROL/control - echo "Priority: $(PRIORITY)" >> $$(I_$(1))/CONTROL/control - echo "Maintainer: $(MAINTAINER)" >> $$(I_$(1))/CONTROL/control - echo "Architecture: $(PKGARCH)" >> $$(I_$(1))/CONTROL/control - echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n ,g' >> $$(I_$(1))/CONTROL/control - ifneq ($(strip $(FILES)),) - mkdir -p $$(I_$(1))/lib/modules/$(LINUX_VERSION) - $(CP) $(FILES) $$(I_$(1))/lib/modules/$(LINUX_VERSION)/ - endif - ifneq ($(MODULES),) - export modules=; \ - add_module() { \ - mkdir -p $$(I_$(1))/etc/modules.d; \ - echo "$$$$2" > $$(I_$(1))/etc/modules.d/$$$$1-$(1); \ - modules="$$$${modules:+$$$$modules }$$$$1-$(1)"; \ - }; \ - $(MODULES) \ - mkdir -p $$(I_$(1))/etc/modules.d; \ - echo "#!/bin/sh" >> $$(I_$(1))/CONTROL/postinst; \ - echo "[ -z \"\$$$$IPKG_INSTROOT\" ] || exit" >> $$(I_$(1))/CONTROL/postinst; \ - echo ". /etc/functions.sh" >> $$(I_$(1))/CONTROL/postinst; \ - echo "load_modules $$$$modules" >> $$(I_$(1))/CONTROL/postinst; \ - chmod 0755 $$(I_$(1))/CONTROL/postinst; - endif - $(IPKG_BUILD) $$(I_$(1)) $(PACKAGE_DIR) -endef - --include $(INCLUDE_DIR)/modules.mk - diff --git a/include/modules.mk b/include/modules.mk deleted file mode 100644 index d20fd41bb..000000000 --- a/include/modules.mk +++ /dev/null @@ -1,33 +0,0 @@ -# -# Copyright (C) 2006 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -include $(TOPDIR)/include/kernel.mk - -define KernelPackage/ide-core -TITLE:=Kernel support for IDE -DESCRIPTION:=Kernel modules for IDE support\\\ - useful for usb mass storage devices (e.g. on WL-HDD)\\\ - \\\ - Includes: \\\ - - ide-core \\\ - - ide-detect \\\ - - ide-disk \\\ - - pdc202xx_old -KCONFIG:=CONFIG_IDE -FILES:=$(MODULES_DIR)/kernel/drivers/ide/*.$(LINUX_KMOD_SUFFIX) -MODULES:=$(call AutoLoad,20,ide-core) $(call AutoLoad,90,ide-detect ide-disk) -endef -$(eval $(call KernelPackage,ide-core)) - -define KernelPackage/ide-pdc202xx -TITLE:=PDC202xx IDE driver -DESCRIPTION:=PDC202xx IDE driver -KCONFIG:=CONFIG_BLK_DEV_PDC202XX_OLD -FILES:=$(MODULES_DIR)/kernel/drivers/ide/pci/pdc202xx_old.$(LINUX_KMOD_SUFFIX) -MODULES:=$(call AutoLoad,30,pdc202xx_old) -endef -$(eval $(call KernelPackage,ide-pdc202xx)) - -- cgit v1.2.3 From 07651c7915851113e8deb1195af84446f6d3d475 Mon Sep 17 00:00:00 2001 From: nbd Date: Tue, 18 Jul 2006 16:35:03 +0000 Subject: move the cryptoapi kmod to package/kernel git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4149 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/modules-2.4.mk | 10 ---------- include/modules-2.6.mk | 8 -------- 2 files changed, 18 deletions(-) (limited to 'include') diff --git a/include/modules-2.4.mk b/include/modules-2.4.mk index f8d966f40..93a897373 100644 --- a/include/modules-2.4.mk +++ b/include/modules-2.4.mk @@ -122,16 +122,6 @@ $(eval $(call KMOD_template,NBD,nbd,\ ,CONFIG_BLK_DEV_NBD,,20,nbd)) -# Crypto - -ifneq ($(wildcard $(MODULES_DIR)/kernel/crypto/*.o),) -CONFIG_CRYPTO:=m -endif -$(eval $(call KMOD_template,CRYPTO,crypto,\ - $(MODULES_DIR)/kernel/crypto/*.o \ -,CONFIG_CRYPTO)) - - # Filesystems $(eval $(call KMOD_template,FS_CIFS,fs-cifs,\ diff --git a/include/modules-2.6.mk b/include/modules-2.6.mk index c98e4ea8a..676758643 100644 --- a/include/modules-2.6.mk +++ b/include/modules-2.6.mk @@ -126,14 +126,6 @@ $(eval $(call KMOD_template,NBD,nbd,\ $(MODULES_DIR)/kernel/drivers/block/nbd.ko \ ,CONFIG_BLK_DEV_NBD,,20,nbd)) - -# Crypto - -$(eval $(call KMOD_template,CRYPTO,crypto,\ - $(MODULES_DIR)/kernel/crypto/*.ko \ -)) - - # Filesystems $(eval $(call KMOD_template,FS_CIFS,fs-cifs,\ -- cgit v1.2.3 From 30010567953c3acfa28c2beafe50e6177254eefa Mon Sep 17 00:00:00 2001 From: nbd Date: Tue, 18 Jul 2006 20:17:05 +0000 Subject: make the buildroot-ng sdk compatible with the old packages git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4158 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/package.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/package.mk b/include/package.mk index 2784cc888..ce07640ee 100644 --- a/include/package.mk +++ b/include/package.mk @@ -41,6 +41,7 @@ define Build/DefaultTargets touch $$@ $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed: $(PKG_BUILD_DIR)/.built + mkdir -p $(STAGING_DIR)/stampfiles $(call Build/InstallDev) touch $$@ -- cgit v1.2.3 From 6aba533b7b0766282848b7551efbfc32f2a0d37c Mon Sep 17 00:00:00 2001 From: nbd Date: Tue, 18 Jul 2006 21:26:56 +0000 Subject: accept V= from the environment as well git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4159 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/verbose.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'include') diff --git a/include/verbose.mk b/include/verbose.mk index da2a21974..58a20a217 100644 --- a/include/verbose.mk +++ b/include/verbose.mk @@ -9,10 +9,7 @@ NO_TRACE_MAKE:=$(MAKE) V=99 ifndef KBUILD_VERBOSE - KBUILD_VERBOSE=0 - ifeq ("$(origin V)", "command line") - KBUILD_VERBOSE=$(V) - endif + KBUILD_VERBOSE=$(V) endif ifneq ($(KBUILD_VERBOSE),99) -- cgit v1.2.3 From 15f12f44a82318e411610fce61f404a2653ca267 Mon Sep 17 00:00:00 2001 From: nbd Date: Tue, 18 Jul 2006 21:28:59 +0000 Subject: fix KBUILD_VERBOSE if V is unset git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4160 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/verbose.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/verbose.mk b/include/verbose.mk index 58a20a217..16a75c08c 100644 --- a/include/verbose.mk +++ b/include/verbose.mk @@ -9,7 +9,10 @@ NO_TRACE_MAKE:=$(MAKE) V=99 ifndef KBUILD_VERBOSE - KBUILD_VERBOSE=$(V) + KBUILD_VERBOSE=0 + ifdef V + KBUILD_VERBOSE=$(V) + endif endif ifneq ($(KBUILD_VERBOSE),99) -- cgit v1.2.3 From c133c86f41a5be64876ad611debb189d5d8b479e Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 19 Jul 2006 13:25:09 +0000 Subject: add a simple prerequisite check git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4168 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/prereq.mk | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) create mode 100644 include/prereq.mk (limited to 'include') diff --git a/include/prereq.mk b/include/prereq.mk new file mode 100644 index 000000000..c51953b61 --- /dev/null +++ b/include/prereq.mk @@ -0,0 +1,118 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk +include $(INCLUDE_DIR)/verbose.mk + +$(TMP_DIR): + mkdir -p $@ + +prereq: + @echo + @if [ -f $(TMP_DIR)/.prereq-error ]; then \ + cat $(TMP_DIR)/.prereq-error; \ + echo; \ + rm -rf $(TMP_DIR); \ + false; \ + fi + @rm -rf $(TMP_DIR) + @mkdir -p $(TMP_DIR) + +define Require + ifeq ($$(CHECK_$(1)),) + prereq: prereq-$(1) + + prereq-$(1): $(TMP_DIR) FORCE + @echo -n "Checking '$(1)'... " + @if $(NO_TRACE_MAKE) -f $(INCLUDE_DIR)/prereq.mk check-$(1) >/dev/null 2>/dev/null; then \ + echo 'ok.'; \ + else \ + echo 'failed.'; \ + echo -e "$(strip $(2))" >> $(TMP_DIR)/.prereq-error; \ + fi + + check-$(1): FORCE + $(call Require/$(1)) + CHECK_$(1):=1 + endif +endef + + +define RequireCommand + define Require/$(1) + which $(1) + endef + + $$(eval $$(call Require,$(1),$(2))) +endef + +# Required for the toolchain +define Require/working-make + echo 'all: test' > $(TMP_DIR)/check.mk + echo 'e0 = $$$$(foreach s,foobar,$$$$(eval $$$$s:))' >> $(TMP_DIR)/check.mk + echo 'e1 = $$$$(foreach s,foobar, $$$$(eval $$$$s:))' >> $(TMP_DIR)/check.mk + echo 'test: $$$$(strip $$$$(e0)) $$$$(strip $$$$(e1))' >> $(TMP_DIR)/check.mk + $(NO_TRACE_MAKE) -f $(TMP_DIR)/check.mk +endef + +$(eval $(call Require,working-make, \ + Your make version is buggy. Please install GNU make v3.81 or later. \ +)) + +define Require/working-gcc + echo 'int main(int argc, char **argv) { return 0; }' | \ + gcc -x c -o $(TMP_DIR)/a.out - +endef + +$(eval $(call Require,working-gcc, \ + No working GNU C Compiler was found on your system. \ +)) + +define Require/working-g++ + echo 'int main(int argc, char **argv) { return 0; }' | \ + g++ -x c++ -o $(TMP_DIR)/a.out -lstdc++ - +endef + +$(eval $(call Require,working-g++, \ + No working GNU C++ Compiler was found on your system. \ +)) + +define Require/zlib + echo 'int main(int argc, char **argv) { gzdopen(0, "rb"); return 0; }' | \ + gcc -x c -o $(TMP_DIR)/a.out -lz - +endef + +$(eval $(call Require,zlib, \ + The development version of zlib was not found on your system. \ +)) + + +$(eval $(call RequireCommand,bison, \ + Please install GNU bison. \ +)) + +$(eval $(call RequireCommand,flex, \ + Please install flex. \ +)) + +$(eval $(call RequireCommand,python, \ + Please install python. \ +)) + +$(eval $(call RequireCommand,unzip, \ + Please install unzip. \ +)) + +$(eval $(call RequireCommand,bzip2, \ + Please install bzip2. \ +)) + +$(eval $(call RequireCommand,patch, \ + Please install patch. \ +)) + + -- cgit v1.2.3 From 32a794689db9de29aca836317584e2d1029df28f Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 19 Jul 2006 16:51:37 +0000 Subject: check for zlib.h as well git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4170 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/prereq.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/prereq.mk b/include/prereq.mk index c51953b61..6b3621dba 100644 --- a/include/prereq.mk +++ b/include/prereq.mk @@ -83,7 +83,7 @@ $(eval $(call Require,working-g++, \ define Require/zlib echo 'int main(int argc, char **argv) { gzdopen(0, "rb"); return 0; }' | \ - gcc -x c -o $(TMP_DIR)/a.out -lz - + gcc -include zlib.h -x c -o $(TMP_DIR)/a.out -lz - endef $(eval $(call Require,zlib, \ -- cgit v1.2.3 From 9b93abc151bd85d930dc6ae342fac5718b7a5310 Mon Sep 17 00:00:00 2001 From: mbm Date: Thu, 20 Jul 2006 17:15:12 +0000 Subject: cleanup & revert [4159] git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4173 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/verbose.mk | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/verbose.mk b/include/verbose.mk index 16a75c08c..7d9b3979b 100644 --- a/include/verbose.mk +++ b/include/verbose.mk @@ -6,11 +6,11 @@ # # $Id:$ -NO_TRACE_MAKE:=$(MAKE) V=99 +export NO_TRACE_MAKE:=$(MAKE) V=99 ifndef KBUILD_VERBOSE KBUILD_VERBOSE=0 - ifdef V + ifeq ("$(origin V)", "command line") KBUILD_VERBOSE=$(V) endif endif @@ -32,6 +32,4 @@ ifneq ($(KBUILD_VERBOSE),99) endif .SILENT: $(MAKECMDGOALS) -else - NO_TRACE_MAKE:=$(MAKE) endif -- cgit v1.2.3 From 121ce3b367ebfcd69d04a2d90d85b7df0d5233ca Mon Sep 17 00:00:00 2001 From: mbm Date: Thu, 20 Jul 2006 17:28:05 +0000 Subject: change 'source' to 'download' git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4176 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/package.mk b/include/package.mk index ce07640ee..38fd93df7 100644 --- a/include/package.mk +++ b/include/package.mk @@ -294,7 +294,7 @@ else mkdir -p $@ ifneq ($(strip $(PKG_SOURCE)),) - source: $(DL_DIR)/$(PKG_SOURCE) + download: $(DL_DIR)/$(PKG_SOURCE) $(DL_DIR)/$(PKG_SOURCE): mkdir -p $(DL_DIR) @@ -303,7 +303,7 @@ else $(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE) endif - source: + download: prepare: $(PKG_BUILD_DIR)/.prepared configure: $(PKG_BUILD_DIR)/.configured -- cgit v1.2.3 From d4641bd34dcc4fd0eab0b68c5b1d3a2b9ea3a9d2 Mon Sep 17 00:00:00 2001 From: groz Date: Thu, 20 Jul 2006 21:06:47 +0000 Subject: UML target completed. Added ext2 target fs for use with uml images git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4178 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/image.mk | 9 +++++++++ include/kernel-build.mk | 4 ++-- include/kernel.mk | 5 +++++ include/target.mk | 1 + 4 files changed, 17 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/image.mk b/include/image.mk index 95accd6e1..54f0e8b6b 100644 --- a/include/image.mk +++ b/include/image.mk @@ -44,6 +44,14 @@ ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) tar -zcf $(BIN_DIR)/openwrt-rootfs.tgz --owner=root --group=root -C $(BUILD_DIR)/root/ . endef endif + + ifeq ($(CONFIG_TARGET_ROOTFS_EXT2FS),y) + define Image/mkfs/ext2 + genext2fs -q -b 4096 -I 1500 -d $(BUILD_DIR)/root/ $(KDIR)/root.ext2 + $(call Image/Build,ext2) + endef + endif + endif define Image/mkfs/prepare/default @@ -69,6 +77,7 @@ install: $(call Image/mkfs/jffs2) $(call Image/mkfs/squashfs) $(call Image/mkfs/tgz) + $(call Image/mkfs/ext2) clean: $(call Build/Clean) diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 942a91516..f46e7f0ff 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -72,13 +72,13 @@ $(LINUX_DIR)/vmlinux: $(STAMP_DIR)/.linux-compile pkg-install ramdisk-config $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) $(LINUX_KERNEL): $(LINUX_DIR)/vmlinux - $(TARGET_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $< $@ + $(KERNEL_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $< $@ touch -c $(LINUX_KERNEL) $(LINUX_DIR)/.modules_done: rm -rf $(KERNEL_BUILD_DIR)/modules $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH="$(TARGET_PATH)" modules - $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install + $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install touch $(LINUX_DIR)/.modules_done modules: $(LINUX_DIR)/.modules_done diff --git a/include/kernel.mk b/include/kernel.mk index 2c5d09377..318ca6869 100644 --- a/include/kernel.mk +++ b/include/kernel.mk @@ -28,6 +28,11 @@ LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \ -e 's/armeb/arm/' \ ) +ifneq (,$(findstring uml,$(BOARD))) +LINUX_KARCH="um" +KERNEL_CROSS= +endif + KERNEL_BUILD_DIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD) LINUX_DIR := $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) diff --git a/include/target.mk b/include/target.mk index 44ff11128..95bd1dbfb 100644 --- a/include/target.mk +++ b/include/target.mk @@ -18,6 +18,7 @@ $(eval $(call kernel_template,2.6,brcm,2_6_BRCM)) $(eval $(call kernel_template,2.6,brcm63xx,2_6_BRCM63XX)) $(eval $(call kernel_template,2.6,rb532,2_6_RB532)) $(eval $(call kernel_template,2.6,x86,2_6_X86)) +$(eval $(call kernel_template,2.6,uml,2_6_UML)) $(eval $(call kernel_template,2.4,ar531x,2_4_AR531X)) $(eval $(call kernel_template,2.6,aruba,2_6_ARUBA)) $(eval $(call kernel_template,2.6,au1000,2_6_AU1000)) -- cgit v1.2.3 From 2f6c50c708b9380b7ca94a73351c3760cb38f96a Mon Sep 17 00:00:00 2001 From: mbm Date: Thu, 20 Jul 2006 23:51:25 +0000 Subject: update prereqs git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4179 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/prereq.mk | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) (limited to 'include') diff --git a/include/prereq.mk b/include/prereq.mk index 6b3621dba..6642ce40e 100644 --- a/include/prereq.mk +++ b/include/prereq.mk @@ -6,29 +6,30 @@ # include $(TOPDIR)/rules.mk -include $(INCLUDE_DIR)/verbose.mk $(TMP_DIR): mkdir -p $@ prereq: - @echo - @if [ -f $(TMP_DIR)/.prereq-error ]; then \ + echo + if [ -f $(TMP_DIR)/.prereq-error ]; then \ cat $(TMP_DIR)/.prereq-error; \ echo; \ rm -rf $(TMP_DIR); \ false; \ fi - @rm -rf $(TMP_DIR) - @mkdir -p $(TMP_DIR) + rm -rf $(TMP_DIR) + mkdir -p $(TMP_DIR) + +.SILENT: $(TMP_DIR) prereq define Require ifeq ($$(CHECK_$(1)),) prereq: prereq-$(1) prereq-$(1): $(TMP_DIR) FORCE - @echo -n "Checking '$(1)'... " - @if $(NO_TRACE_MAKE) -f $(INCLUDE_DIR)/prereq.mk check-$(1) >/dev/null 2>/dev/null; then \ + echo -n "Checking '$(1)'... " + if $(NO_TRACE_MAKE) -f $(INCLUDE_DIR)/prereq.mk check-$(1) >/dev/null 2>/dev/null; then \ echo 'ok.'; \ else \ echo 'failed.'; \ @@ -38,6 +39,8 @@ define Require check-$(1): FORCE $(call Require/$(1)) CHECK_$(1):=1 + + .SILENT: prereq-$(1) check-$(1) endif endef @@ -69,7 +72,7 @@ define Require/working-gcc endef $(eval $(call Require,working-gcc, \ - No working GNU C Compiler was found on your system. \ + No working GNU C Compiler (gcc) was found on your system. \ )) define Require/working-g++ @@ -78,7 +81,7 @@ define Require/working-g++ endef $(eval $(call Require,working-g++, \ - No working GNU C++ Compiler was found on your system. \ + No working GNU C++ Compiler (g++) was found on your system. \ )) define Require/zlib @@ -87,7 +90,7 @@ define Require/zlib endef $(eval $(call Require,zlib, \ - The development version of zlib was not found on your system. \ + No zlib development files were not found on your system. \ )) @@ -115,4 +118,6 @@ $(eval $(call RequireCommand,patch, \ Please install patch. \ )) - +$(eval $(call RequireCommand,perl, \ + Please install perl. \ +)) -- cgit v1.2.3 From 7d1de255f4071b9a05b417fb737b484177d776d6 Mon Sep 17 00:00:00 2001 From: mbm Date: Thu, 20 Jul 2006 23:52:27 +0000 Subject: change $(STAMP_DIR) to $(LINUX_DIR) to avoid issues compiling multiple kernels git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4180 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-build.mk | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'include') diff --git a/include/kernel-build.mk b/include/kernel-build.mk index f46e7f0ff..3fb96e100 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -19,9 +19,6 @@ INSTALL_TARGETS += $(KERNEL_IPKG) $(TARGETS): $(PACKAGE_DIR) -$(LINUX_DIR): - mkdir -p $@ - $(PACKAGE_DIR): mkdir -p $@ @@ -68,7 +65,7 @@ else echo 'CONFIG_INITRAMFS_SOURCE=""' >> $(LINUX_DIR)/.config endif -$(LINUX_DIR)/vmlinux: $(STAMP_DIR)/.linux-compile pkg-install ramdisk-config +$(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.linux-compile pkg-install ramdisk-config $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) $(LINUX_KERNEL): $(LINUX_DIR)/vmlinux @@ -84,10 +81,10 @@ $(LINUX_DIR)/.modules_done: modules: $(LINUX_DIR)/.modules_done packages: $(TARGETS) -$(STAMP_DIR)/.linux-compile: +$(LINUX_DIR)/.linux-compile: + ln -sf $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) $(BUILD_DIR)/linux @$(MAKE) modules @$(MAKE) packages - ln -sf $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) $(BUILD_DIR)/linux touch $@ $(KERNEL_IPKG): @@ -111,14 +108,14 @@ pkg-install: FORCE source: $(DL_DIR)/$(LINUX_SOURCE) prepare: $(LINUX_DIR)/.configured - @mkdir -p $(STAMP_DIR) $(PACKAGE_DIR) + @mkdir -p $(LINUX_DIR) $(PACKAGE_DIR) -compile: prepare $(STAMP_DIR)/.linux-compile +compile: prepare $(LINUX_DIR)/.linux-compile install: compile $(LINUX_KERNEL) mostlyclean: FORCE - rm -f $(STAMP_DIR)/.linux-compile + rm -f $(LINUX_DIR)/.linux-compile rm -f $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)/.modules_done rm -f $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)/.drivers-unpacked $(MAKE) -C $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) clean -- cgit v1.2.3 From f56848b8608c6befd1b573e1bd1cac8369ddda5e Mon Sep 17 00:00:00 2001 From: mbm Date: Fri, 21 Jul 2006 00:08:50 +0000 Subject: fix a few broken depenancies git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4181 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/modules-2.6.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/modules-2.6.mk b/include/modules-2.6.mk index 676758643..56129343f 100644 --- a/include/modules-2.6.mk +++ b/include/modules-2.6.mk @@ -22,7 +22,7 @@ $(eval $(call KMOD_template,GRE,gre,\ $(eval $(call KMOD_template,IMQ,imq,\ $(MODULES_DIR)/kernel/net/ipv4/netfilter/*IMQ*.ko \ $(MODULES_DIR)/kernel/drivers/net/imq.ko \ -)) +,CONFIG_IMQ)) $(eval $(call KMOD_template,IPIP,ipip,\ $(MODULES_DIR)/kernel/net/ipv4/ipip.ko \ @@ -54,7 +54,7 @@ $(eval $(call KMOD_template,PPPOE,pppoe,\ $(eval $(call KMOD_template,SCHED,sched,\ $(MODULES_DIR)/kernel/net/sched/*.ko \ -)) +,CONFIG_NET_SCHED)) $(eval $(call KMOD_template,TUN,tun,\ $(MODULES_DIR)/kernel/drivers/net/tun.ko \ -- cgit v1.2.3 From 8b0bcee75e4e1300cdcb7dbf0f60989f84e31cd2 Mon Sep 17 00:00:00 2001 From: nbd Date: Fri, 21 Jul 2006 14:27:45 +0000 Subject: add submenu dependencies (used to hide the proprietary broadcom driver on anything except for brcm-2.4) git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4197 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/package.mk | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'include') diff --git a/include/package.mk b/include/package.mk index 38fd93df7..757c8396a 100644 --- a/include/package.mk +++ b/include/package.mk @@ -83,6 +83,7 @@ define Package/Default DEFAULT:= MENU:= SUBMENU:= + SUBMENUDEP:= TITLE:= DESCRIPTION:= endef @@ -142,6 +143,10 @@ define BuildPackage ifneq ($(SUBMENU),) DUMPINFO += \ echo "Submenu: $(SUBMENU)"; + ifneq ($(SUBMENUDEP),) + DUMPINFO += \ + echo "Submenu-Depends: $(SUBMENUDEP)"; + endif endif ifneq ($(DEFAULT),) -- cgit v1.2.3 From 65aeed311cbddeb66427150582239ff1623246d9 Mon Sep 17 00:00:00 2001 From: mbm Date: Fri, 21 Jul 2006 17:00:14 +0000 Subject: fix a few directories missed in [4176]'s source -> download git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4198 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/host-build.mk | 4 ++-- include/image.mk | 2 +- include/kernel-build.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/host-build.mk b/include/host-build.mk index 43c83142d..9a5a41317 100644 --- a/include/host-build.mk +++ b/include/host-build.mk @@ -64,7 +64,7 @@ endef ifneq ($(strip $(PKG_SOURCE)),) - source: $(DL_DIR)/$(PKG_SOURCE) + download: $(DL_DIR)/$(PKG_SOURCE) $(DL_DIR)/$(PKG_SOURCE): mkdir -p $(DL_DIR) @@ -101,7 +101,7 @@ define HostBuild $(call Build/Uninstall) rm -f $(STAGING_DIR)/stampfiles/.host_$(PKG_NAME)-installed - source: + download: prepare: $(PKG_BUILD_DIR)/.prepared configure: $(PKG_BUILD_DIR)/.configured diff --git a/include/image.mk b/include/image.mk index 54f0e8b6b..87d6815ee 100644 --- a/include/image.mk +++ b/include/image.mk @@ -87,7 +87,7 @@ compile-targets: install-targets: clean-targets: -source: +download: prepare: compile: compile-targets install: compile install-targets diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 3fb96e100..38ea9a18e 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -106,7 +106,7 @@ pkg-install: FORCE $(IPKG) install $$pkg || echo; \ done -source: $(DL_DIR)/$(LINUX_SOURCE) +download: $(DL_DIR)/$(LINUX_SOURCE) prepare: $(LINUX_DIR)/.configured @mkdir -p $(LINUX_DIR) $(PACKAGE_DIR) -- cgit v1.2.3 From 25307576b9e7d8c2076f820775c9f65b1b3478cc Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 22 Jul 2006 11:43:48 +0000 Subject: fix prereqs git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4203 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/prereq.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/prereq.mk b/include/prereq.mk index 6642ce40e..cbd26be12 100644 --- a/include/prereq.mk +++ b/include/prereq.mk @@ -29,7 +29,7 @@ define Require prereq-$(1): $(TMP_DIR) FORCE echo -n "Checking '$(1)'... " - if $(NO_TRACE_MAKE) -f $(INCLUDE_DIR)/prereq.mk check-$(1) >/dev/null 2>/dev/null; then \ + if $(MAKE) -f $(INCLUDE_DIR)/prereq.mk check-$(1) >/dev/null 2>/dev/null; then \ echo 'ok.'; \ else \ echo 'failed.'; \ @@ -59,7 +59,7 @@ define Require/working-make echo 'e0 = $$$$(foreach s,foobar,$$$$(eval $$$$s:))' >> $(TMP_DIR)/check.mk echo 'e1 = $$$$(foreach s,foobar, $$$$(eval $$$$s:))' >> $(TMP_DIR)/check.mk echo 'test: $$$$(strip $$$$(e0)) $$$$(strip $$$$(e1))' >> $(TMP_DIR)/check.mk - $(NO_TRACE_MAKE) -f $(TMP_DIR)/check.mk + $(MAKE) -f $(TMP_DIR)/check.mk endef $(eval $(call Require,working-make, \ -- cgit v1.2.3 From 6ebfaece496cffd64455080e24df249d38c17e94 Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 22 Jul 2006 12:04:08 +0000 Subject: revert last prereq.mk - seems to be a different issue git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4204 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/prereq.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/prereq.mk b/include/prereq.mk index cbd26be12..6642ce40e 100644 --- a/include/prereq.mk +++ b/include/prereq.mk @@ -29,7 +29,7 @@ define Require prereq-$(1): $(TMP_DIR) FORCE echo -n "Checking '$(1)'... " - if $(MAKE) -f $(INCLUDE_DIR)/prereq.mk check-$(1) >/dev/null 2>/dev/null; then \ + if $(NO_TRACE_MAKE) -f $(INCLUDE_DIR)/prereq.mk check-$(1) >/dev/null 2>/dev/null; then \ echo 'ok.'; \ else \ echo 'failed.'; \ @@ -59,7 +59,7 @@ define Require/working-make echo 'e0 = $$$$(foreach s,foobar,$$$$(eval $$$$s:))' >> $(TMP_DIR)/check.mk echo 'e1 = $$$$(foreach s,foobar, $$$$(eval $$$$s:))' >> $(TMP_DIR)/check.mk echo 'test: $$$$(strip $$$$(e0)) $$$$(strip $$$$(e1))' >> $(TMP_DIR)/check.mk - $(MAKE) -f $(TMP_DIR)/check.mk + $(NO_TRACE_MAKE) -f $(TMP_DIR)/check.mk endef $(eval $(call Require,working-make, \ -- cgit v1.2.3 From de94a93b4b63b2f8f9b1b058b7f7eed6cad1adf6 Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 22 Jul 2006 12:16:26 +0000 Subject: fix NO_TRACE_MAKE git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4205 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/verbose.mk | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/verbose.mk b/include/verbose.mk index 7d9b3979b..525fbf1c1 100644 --- a/include/verbose.mk +++ b/include/verbose.mk @@ -6,13 +6,16 @@ # # $Id:$ -export NO_TRACE_MAKE:=$(MAKE) V=99 +ifeq ($(NO_TRACE_MAKE),) +NO_TRACE_MAKE := $(MAKE) V=99 +export NO_TRACE_MAKE +endif ifndef KBUILD_VERBOSE - KBUILD_VERBOSE=0 - ifeq ("$(origin V)", "command line") - KBUILD_VERBOSE=$(V) - endif + KBUILD_VERBOSE:=0 +endif +ifeq ("$(origin V)", "command line") + KBUILD_VERBOSE:=$(V) endif ifneq ($(KBUILD_VERBOSE),99) -- cgit v1.2.3 From 95a463ce0f08f0fec00a044c725f525b801d4443 Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 22 Jul 2006 12:33:28 +0000 Subject: port over the netfilter module packaging to the new system and fix iptables dependencies git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4206 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/modules-2.4.mk | 59 ------------------------------------------------ include/modules-2.6.mk | 61 -------------------------------------------------- include/netfilter.mk | 6 ++--- 3 files changed, 2 insertions(+), 124 deletions(-) (limited to 'include') diff --git a/include/modules-2.4.mk b/include/modules-2.4.mk index 93a897373..4f2d0b5dd 100644 --- a/include/modules-2.4.mk +++ b/include/modules-2.4.mk @@ -17,10 +17,6 @@ $(eval $(call KMOD_template,GRE,gre,\ $(MODULES_DIR)/kernel/net/ipv4/ip_gre.o \ ,CONFIG_NET_IPGRE)) -$(eval $(call KMOD_template,IMQ,imq,\ - $(MODULES_DIR)/kernel/net/ipv4/netfilter/*IMQ*.o \ - $(MODULES_DIR)/kernel/drivers/net/imq.o \ -)) $(eval $(call KMOD_template,IPIP,ipip,\ $(MODULES_DIR)/kernel/net/ipv4/ipip.o \ ,CONFIG_NET_IPIP,,60,ipip)) @@ -56,61 +52,6 @@ $(eval $(call KMOD_template,TUN,tun,\ $(MODULES_DIR)/kernel/drivers/net/tun.o \ ,CONFIG_TUN,,20,tun)) -# Filtering / Firewalling - -$(eval $(call KMOD_template,ARPTABLES,arptables,\ - $(MODULES_DIR)/kernel/net/ipv4/netfilter/arp*.o \ -,CONFIG_IP_NF_ARPTABLES)) - -$(eval $(call KMOD_template,EBTABLES,ebtables,\ - $(MODULES_DIR)/kernel/net/bridge/netfilter/*.o \ -,CONFIG_BRIDGE_NF_EBTABLES)) - -# metapackage for compatibility ... -$(eval $(call KMOD_template,IPTABLES_EXTRA,iptables-extra,\ -,,kmod-ipt-conntrack kmod-ipt-extra kmod-ipt-filter kmod-ipt-ipopt kmod-ipt-ipsec kmod-ipt-nat kmod-ipt-nat-extra kmod-ipt-queue kmod-ipt-ulogd)) - -$(eval $(call KMOD_template,IPT_CONNTRACK,ipt-conntrack,\ - $(foreach mod,$(IPT_CONNTRACK-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \ -)) - -$(eval $(call KMOD_template,IPT_EXTRA,ipt-extra,\ - $(foreach mod,$(IPT_EXTRA-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \ -)) - -$(eval $(call KMOD_template,IPT_FILTER,ipt-filter,\ - $(foreach mod,$(IPT_FILTER-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \ -)) - -$(eval $(call KMOD_template,IPT_IPOPT,ipt-ipopt,\ - $(foreach mod,$(IPT_IPOPT-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \ -)) - -$(eval $(call KMOD_template,IPT_IPSEC,ipt-ipsec,\ - $(foreach mod,$(IPT_IPSEC-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \ -)) - -$(eval $(call KMOD_template,IPT_NAT,ipt-nat,\ - $(foreach mod,$(IPT_NAT-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \ -)) - -$(eval $(call KMOD_template,IPT_NAT_EXTRA,ipt-nat-extra,\ - $(foreach mod,$(IPT_NAT_EXTRA-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \ -,,,40,$(IPT_NAT_EXTRA-m))) - -$(eval $(call KMOD_template,IPT_QUEUE,ipt-queue,\ - $(foreach mod,$(IPT_QUEUE-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \ -)) - -$(eval $(call KMOD_template,IPT_ULOG,ipt-ulog,\ - $(foreach mod,$(IPT_ULOG-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \ -)) - -$(eval $(call KMOD_template,IP6TABLES,ip6tables,\ - $(MODULES_DIR)/kernel/net/ipv6/netfilter/ip*.o \ -,CONFIG_IP6_NF_IPTABLES,kmod-ipv6)) - - # Block devices $(eval $(call KMOD_template,LOOP,loop,\ diff --git a/include/modules-2.6.mk b/include/modules-2.6.mk index 56129343f..dab735576 100644 --- a/include/modules-2.6.mk +++ b/include/modules-2.6.mk @@ -19,11 +19,6 @@ $(eval $(call KMOD_template,GRE,gre,\ $(MODULES_DIR)/kernel/net/ipv4/ip_gre.ko \ ,CONFIG_NET_IPGRE)) -$(eval $(call KMOD_template,IMQ,imq,\ - $(MODULES_DIR)/kernel/net/ipv4/netfilter/*IMQ*.ko \ - $(MODULES_DIR)/kernel/drivers/net/imq.ko \ -,CONFIG_IMQ)) - $(eval $(call KMOD_template,IPIP,ipip,\ $(MODULES_DIR)/kernel/net/ipv4/ipip.ko \ ,CONFIG_NET_IPIP,,60,ipip)) @@ -60,62 +55,6 @@ $(eval $(call KMOD_template,TUN,tun,\ $(MODULES_DIR)/kernel/drivers/net/tun.ko \ ,CONFIG_TUN,,20,tun)) - -# Filtering / Firewalling - -$(eval $(call KMOD_template,ARPTABLES,arptables,\ - $(MODULES_DIR)/kernel/net/ipv4/netfilter/arp*.ko \ -,CONFIG_IP_NF_ARPTABLES)) - -$(eval $(call KMOD_template,EBTABLES,ebtables,\ - $(MODULES_DIR)/kernel/net/bridge/netfilter/*.ko \ -,CONFIG_BRIDGE_NF_EBTABLES)) - -# metapackage for compatibility ... -$(eval $(call KMOD_template,IPTABLES_EXTRA,iptables-extra,\ -,,kmod-ipt-conntrack kmod-ipt-extra kmod-ipt-filter kmod-ipt-ipopt kmod-ipt-ipsec kmod-ipt-nat kmod-ipt-nat-extra kmod-ipt-queue kmod-ipt-ulogd)) - -$(eval $(call KMOD_template,IPT_CONNTRACK,ipt-conntrack,\ - $(foreach mod,$(IPT_CONNTRACK-m),$(MODULES_DIR)/kernel/net/$(mod).ko) \ -)) - -$(eval $(call KMOD_template,IPT_EXTRA,ipt-extra,\ - $(foreach mod,$(IPT_EXTRA-m),$(MODULES_DIR)/kernel/net/$(mod).ko) \ -)) - -$(eval $(call KMOD_template,IPT_FILTER,ipt-filter,\ - $(foreach mod,$(IPT_FILTER-m),$(MODULES_DIR)/kernel/net/$(mod).ko) \ -)) - -$(eval $(call KMOD_template,IPT_IPOPT,ipt-ipopt,\ - $(foreach mod,$(IPT_IPOPT-m),$(MODULES_DIR)/kernel/net/$(mod).ko) \ -)) - -$(eval $(call KMOD_template,IPT_IPSEC,ipt-ipsec,\ - $(foreach mod,$(IPT_IPSEC-m),$(MODULES_DIR)/kernel/net/$(mod).ko) \ -)) - -$(eval $(call KMOD_template,IPT_NAT,ipt-nat,\ - $(foreach mod,$(IPT_NAT-m),$(MODULES_DIR)/kernel/net/$(mod).ko) \ -)) - -$(eval $(call KMOD_template,IPT_NAT_EXTRA,ipt-nat-extra,\ - $(foreach mod,$(IPT_NAT_EXTRA-m),$(MODULES_DIR)/kernel/net/$(mod).ko) \ -,,,40,$(IPT_NAT_EXTRA-m))) - -$(eval $(call KMOD_template,IPT_QUEUE,ipt-queue,\ - $(foreach mod,$(IPT_QUEUE-m),$(MODULES_DIR)/kernel/net/$(mod).ko) \ -)) - -$(eval $(call KMOD_template,IPT_ULOG,ipt-ulog,\ - $(foreach mod,$(IPT_ULOG-m),$(MODULES_DIR)/kernel/net/$(mod).ko) \ -)) - -$(eval $(call KMOD_template,IP6TABLES,ip6tables,\ - $(MODULES_DIR)/kernel/net/ipv6/netfilter/ip*.ko \ -,CONFIG_IP6_NF_IPTABLES,kmod-ipv6)) - - # Block devices $(eval $(call KMOD_template,LOOP,loop,\ diff --git a/include/netfilter.mk b/include/netfilter.mk index 236d4b242..d4ec0f391 100644 --- a/include/netfilter.mk +++ b/include/netfilter.mk @@ -6,12 +6,9 @@ # # $Id: netfilter.mk 2411 2005-11-11 03:41:43Z nico $ -ifeq ($(NF_2_6),1) +ifeq ($(NF_KMOD),1) P_V4:=ipv4/netfilter/ P_XT:=netfilter/ -else -P_V4:= -P_XT:= endif IPT_CONNTRACK-m := @@ -84,6 +81,7 @@ IPT_NAT-$(CONFIG_IP_NF_NAT) += $(P_V4)ipt_SNAT $(P_V4)ipt_DNAT IPT_NAT-$(CONFIG_IP_NF_TARGET_MASQUERADE) += $(P_V4)ipt_MASQUERADE IPT_NAT-$(CONFIG_IP_NF_TARGET_MIRROR) += $(P_V4)ipt_MIRROR IPT_NAT-$(CONFIG_IP_NF_TARGET_REDIRECT) += $(P_V4)ipt_REDIRECT +IPT_NAT-$(CONFIG_IP_NF_TARGET_NETMAP) += $(P_V4)ipt_NETMAP IPT_NAT_EXTRA-m := IPT_NAT_EXTRA-$(CONFIG_IP_NF_AMANDA) += $(P_V4)ip_conntrack_amanda -- cgit v1.2.3 From 8e66fbe159793d5308dcb3a3e29371a0208cb5da Mon Sep 17 00:00:00 2001 From: nico Date: Sat, 22 Jul 2006 16:33:33 +0000 Subject: add genext2fs to build ext2 filesystem images git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4213 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/image.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/image.mk b/include/image.mk index 87d6815ee..ba3cfb8af 100644 --- a/include/image.mk +++ b/include/image.mk @@ -47,7 +47,7 @@ ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) ifeq ($(CONFIG_TARGET_ROOTFS_EXT2FS),y) define Image/mkfs/ext2 - genext2fs -q -b 4096 -I 1500 -d $(BUILD_DIR)/root/ $(KDIR)/root.ext2 + $(STAGING_DIR)/bin/genext2fs -q -b 4096 -I 1500 -d $(BUILD_DIR)/root/ $(KDIR)/root.ext2 $(call Image/Build,ext2) endef endif -- cgit v1.2.3 From 27335d91b487bca2a004f3541bbe402ba3f68faf Mon Sep 17 00:00:00 2001 From: nbd Date: Sun, 23 Jul 2006 23:02:37 +0000 Subject: add ncurses to prereq checks git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4244 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/prereq.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'include') diff --git a/include/prereq.mk b/include/prereq.mk index 6642ce40e..e514855a6 100644 --- a/include/prereq.mk +++ b/include/prereq.mk @@ -84,6 +84,16 @@ $(eval $(call Require,working-g++, \ No working GNU C++ Compiler (g++) was found on your system. \ )) +define Require/ncurses + echo 'int main(int argc, char **argv) { initscr(); return 0; }' | \ + gcc -include ncurses.h -x c -o $(TMP_DIR)/a.out -lncurses - +endef + +$(eval $(call Require,ncurses, \ + No ncurses development files were not found on your system. \ +)) + + define Require/zlib echo 'int main(int argc, char **argv) { gzdopen(0, "rb"); return 0; }' | \ gcc -include zlib.h -x c -o $(TMP_DIR)/a.out -lz - -- cgit v1.2.3 From b1b9e3fadc4d2575d7846c202e93bbdefd55d6a1 Mon Sep 17 00:00:00 2001 From: mbm Date: Wed, 26 Jul 2006 01:01:09 +0000 Subject: add more ipkg validation checks git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4292 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/package.mk | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'include') diff --git a/include/package.mk b/include/package.mk index 757c8396a..7af742039 100644 --- a/include/package.mk +++ b/include/package.mk @@ -12,14 +12,12 @@ endif define Build/DefaultTargets ifeq ($(DUMP),) - ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) .),$(PKG_BUILD_DIR)) - ifeq ($(CONFIG_AUTOREBUILD),y) + ifeq ($(CONFIG_AUTOREBUILD),y) + ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) .),$(PKG_BUILD_DIR)) $(PKG_BUILD_DIR)/.prepared: package-clean endif - endif - ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg $(IPKG_$(1)) $(PKG_BUILD_DIR)),$(IPKG_$(1))) - ifeq ($(CONFIG_AUTOREBUILD),y) + ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg $(IPKG_$(1)) $(PKG_BUILD_DIR)),$(IPKG_$(1))) $(PKG_BUILD_DIR)/.built: package-rebuild endif endif @@ -182,7 +180,7 @@ define BuildPackage $(eval $(call BuildIPKGVariable,$(1),postinst)) $(eval $(call BuildIPKGVariable,$(1),prerm)) $(eval $(call BuildIPKGVariable,$(1),postrm)) - $$(IDIR_$(1))/CONTROL/control: Makefile $(PKG_BUILD_DIR)/.prepared + $$(IDIR_$(1))/CONTROL/control: Makefile $(PKG_BUILD_DIR)/.prepared $(PKG_BUILD_DIR)/.version-$(1)_$(VERSION)_$(PKGARCH) mkdir -p $$(IDIR_$(1))/CONTROL echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control echo "Version: $(VERSION)" >> $$(IDIR_$(1))/CONTROL/control @@ -212,6 +210,7 @@ define BuildPackage -find $$(IDIR_$(1)) -name '.#*' | xargs rm -f $(RSTRIP) $$(IDIR_$(1)) $(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR) + @[ -f $$(IPKG_$(1)) ] || false $$(INFO_$(1)): $$(IPKG_$(1)) $(IPKG) install $$(IPKG_$(1)) @@ -221,6 +220,10 @@ define BuildPackage clean: $(1)-clean + $(PKG_BUILD_DIR)/.version-$(1)_$(VERSION)_$(PKGARCH): + -rm $(PKG_BUILD_DIR)/.version-$(1)_* + @touch $$@ + $$(eval $$(call Build/DefaultTargets,$(1))) endef -- cgit v1.2.3 From 3f07a6aa051a0413da8796389a62574955d15982 Mon Sep 17 00:00:00 2001 From: mbm Date: Fri, 28 Jul 2006 17:53:19 +0000 Subject: fix build issues with SMP compiles git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4317 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/package.mk b/include/package.mk index 7af742039..e0765f7ba 100644 --- a/include/package.mk +++ b/include/package.mk @@ -220,7 +220,7 @@ define BuildPackage clean: $(1)-clean - $(PKG_BUILD_DIR)/.version-$(1)_$(VERSION)_$(PKGARCH): + $(PKG_BUILD_DIR)/.version-$(1)_$(VERSION)_$(PKGARCH): $(PKG_BUILD_DIR)/.prepared -rm $(PKG_BUILD_DIR)/.version-$(1)_* @touch $$@ -- cgit v1.2.3 From 432ce85854aea17f9383519db1c2d3a8307c0760 Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 29 Jul 2006 11:30:06 +0000 Subject: add support for per-package prereq checks, run global prereq checks before (menu-)config git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4318 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/package.mk | 2 ++ include/prereq-build.mk | 88 +++++++++++++++++++++++++++++++++++++++++++++++++ include/prereq.mk | 84 ++-------------------------------------------- 3 files changed, 92 insertions(+), 82 deletions(-) create mode 100644 include/prereq-build.mk (limited to 'include') diff --git a/include/package.mk b/include/package.mk index e0765f7ba..cd1a33c48 100644 --- a/include/package.mk +++ b/include/package.mk @@ -10,6 +10,8 @@ else all: compile endif +include $(INCLUDE_DIR)/prereq.mk + define Build/DefaultTargets ifeq ($(DUMP),) ifeq ($(CONFIG_AUTOREBUILD),y) diff --git a/include/prereq-build.mk b/include/prereq-build.mk new file mode 100644 index 000000000..a6de9b270 --- /dev/null +++ b/include/prereq-build.mk @@ -0,0 +1,88 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk +include $(INCLUDE_DIR)/prereq.mk + +# Required for the toolchain +define Require/working-make + echo 'all: test' > $(TMP_DIR)/check.mk + echo 'e0 = $$$$(foreach s,foobar,$$$$(eval $$$$s:))' >> $(TMP_DIR)/check.mk + echo 'e1 = $$$$(foreach s,foobar, $$$$(eval $$$$s:))' >> $(TMP_DIR)/check.mk + echo 'test: $$$$(strip $$$$(e0)) $$$$(strip $$$$(e1))' >> $(TMP_DIR)/check.mk + $(NO_TRACE_MAKE) -f $(TMP_DIR)/check.mk +endef + +$(eval $(call Require,working-make, \ + Your make version is buggy. Please install GNU make v3.81 or later. \ +)) + +define Require/working-gcc + echo 'int main(int argc, char **argv) { return 0; }' | \ + gcc -x c -o $(TMP_DIR)/a.out - +endef + +$(eval $(call Require,working-gcc, \ + No working GNU C Compiler (gcc) was found on your system. \ +)) + +define Require/working-g++ + echo 'int main(int argc, char **argv) { return 0; }' | \ + g++ -x c++ -o $(TMP_DIR)/a.out -lstdc++ - +endef + +$(eval $(call Require,working-g++, \ + No working GNU C++ Compiler (g++) was found on your system. \ +)) + +define Require/ncurses + echo 'int main(int argc, char **argv) { initscr(); return 0; }' | \ + gcc -include ncurses.h -x c -o $(TMP_DIR)/a.out -lncurses - +endef + +$(eval $(call Require,ncurses, \ + No ncurses development files were not found on your system. \ +)) + + +define Require/zlib + echo 'int main(int argc, char **argv) { gzdopen(0, "rb"); return 0; }' | \ + gcc -include zlib.h -x c -o $(TMP_DIR)/a.out -lz - +endef + +$(eval $(call Require,zlib, \ + No zlib development files were not found on your system. \ +)) + + +$(eval $(call RequireCommand,bison, \ + Please install GNU bison. \ +)) + +$(eval $(call RequireCommand,flex, \ + Please install flex. \ +)) + +$(eval $(call RequireCommand,python, \ + Please install python. \ +)) + +$(eval $(call RequireCommand,unzip, \ + Please install unzip. \ +)) + +$(eval $(call RequireCommand,bzip2, \ + Please install bzip2. \ +)) + +$(eval $(call RequireCommand,patch, \ + Please install patch. \ +)) + +$(eval $(call RequireCommand,perl, \ + Please install perl. \ +)) diff --git a/include/prereq.mk b/include/prereq.mk index e514855a6..c9b82d294 100644 --- a/include/prereq.mk +++ b/include/prereq.mk @@ -5,14 +5,12 @@ # See /LICENSE for more information. # -include $(TOPDIR)/rules.mk - $(TMP_DIR): mkdir -p $@ prereq: - echo if [ -f $(TMP_DIR)/.prereq-error ]; then \ + echo; \ cat $(TMP_DIR)/.prereq-error; \ echo; \ rm -rf $(TMP_DIR); \ @@ -29,7 +27,7 @@ define Require prereq-$(1): $(TMP_DIR) FORCE echo -n "Checking '$(1)'... " - if $(NO_TRACE_MAKE) -f $(INCLUDE_DIR)/prereq.mk check-$(1) >/dev/null 2>/dev/null; then \ + if $(NO_TRACE_MAKE) -f $(firstword $(MAKEFILE_LIST)) check-$(1) >/dev/null 2>/dev/null; then \ echo 'ok.'; \ else \ echo 'failed.'; \ @@ -53,81 +51,3 @@ define RequireCommand $$(eval $$(call Require,$(1),$(2))) endef -# Required for the toolchain -define Require/working-make - echo 'all: test' > $(TMP_DIR)/check.mk - echo 'e0 = $$$$(foreach s,foobar,$$$$(eval $$$$s:))' >> $(TMP_DIR)/check.mk - echo 'e1 = $$$$(foreach s,foobar, $$$$(eval $$$$s:))' >> $(TMP_DIR)/check.mk - echo 'test: $$$$(strip $$$$(e0)) $$$$(strip $$$$(e1))' >> $(TMP_DIR)/check.mk - $(NO_TRACE_MAKE) -f $(TMP_DIR)/check.mk -endef - -$(eval $(call Require,working-make, \ - Your make version is buggy. Please install GNU make v3.81 or later. \ -)) - -define Require/working-gcc - echo 'int main(int argc, char **argv) { return 0; }' | \ - gcc -x c -o $(TMP_DIR)/a.out - -endef - -$(eval $(call Require,working-gcc, \ - No working GNU C Compiler (gcc) was found on your system. \ -)) - -define Require/working-g++ - echo 'int main(int argc, char **argv) { return 0; }' | \ - g++ -x c++ -o $(TMP_DIR)/a.out -lstdc++ - -endef - -$(eval $(call Require,working-g++, \ - No working GNU C++ Compiler (g++) was found on your system. \ -)) - -define Require/ncurses - echo 'int main(int argc, char **argv) { initscr(); return 0; }' | \ - gcc -include ncurses.h -x c -o $(TMP_DIR)/a.out -lncurses - -endef - -$(eval $(call Require,ncurses, \ - No ncurses development files were not found on your system. \ -)) - - -define Require/zlib - echo 'int main(int argc, char **argv) { gzdopen(0, "rb"); return 0; }' | \ - gcc -include zlib.h -x c -o $(TMP_DIR)/a.out -lz - -endef - -$(eval $(call Require,zlib, \ - No zlib development files were not found on your system. \ -)) - - -$(eval $(call RequireCommand,bison, \ - Please install GNU bison. \ -)) - -$(eval $(call RequireCommand,flex, \ - Please install flex. \ -)) - -$(eval $(call RequireCommand,python, \ - Please install python. \ -)) - -$(eval $(call RequireCommand,unzip, \ - Please install unzip. \ -)) - -$(eval $(call RequireCommand,bzip2, \ - Please install bzip2. \ -)) - -$(eval $(call RequireCommand,patch, \ - Please install patch. \ -)) - -$(eval $(call RequireCommand,perl, \ - Please install perl. \ -)) -- cgit v1.2.3 From 4a7464651be077eaa3e032e25d0a188160caa9e4 Mon Sep 17 00:00:00 2001 From: nbd Date: Sun, 30 Jul 2006 15:27:51 +0000 Subject: port ppp modules to package/kernel and fix ppp package dependencies git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4329 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/modules-2.4.mk | 19 ------------------- include/modules-2.6.mk | 20 -------------------- 2 files changed, 39 deletions(-) (limited to 'include') diff --git a/include/modules-2.4.mk b/include/modules-2.4.mk index 4f2d0b5dd..8e7d2308a 100644 --- a/include/modules-2.4.mk +++ b/include/modules-2.4.mk @@ -25,25 +25,6 @@ $(eval $(call KMOD_template,IPV6,ipv6,\ $(MODULES_DIR)/kernel/net/ipv6/ipv6.o \ ,CONFIG_IPV6,,20,ipv6)) -$(eval $(call KMOD_template,PPP,ppp,\ - $(MODULES_DIR)/kernel/drivers/net/ppp_async.o \ - $(MODULES_DIR)/kernel/drivers/net/ppp_generic.o \ - $(MODULES_DIR)/kernel/drivers/net/slhc.o \ - $(MODULES_DIR)/kernel/drivers/net/pppox.o \ -,CONFIG_PPP)) - -$(eval $(call KMOD_template,MPPE,mppe,\ - $(MODULES_DIR)/kernel/drivers/net/ppp_mppe_mppc.o \ -,CONFIG_PPP_MPPE_MPPC)) - -$(eval $(call KMOD_template,PPPOATM,pppoatm,\ - $(MODULES_DIR)/kernel/net/atm/pppoatm.o \ -,CONFIG_PPPOATM)) - -$(eval $(call KMOD_template,PPPOE,pppoe,\ - $(MODULES_DIR)/kernel/drivers/net/pppoe.o \ -,CONFIG_PPPOE)) - $(eval $(call KMOD_template,SCHED,sched,\ $(MODULES_DIR)/kernel/net/sched/*.o \ )) diff --git a/include/modules-2.6.mk b/include/modules-2.6.mk index dab735576..533a4c956 100644 --- a/include/modules-2.6.mk +++ b/include/modules-2.6.mk @@ -27,26 +27,6 @@ $(eval $(call KMOD_template,IPV6,ipv6,\ $(MODULES_DIR)/kernel/net/ipv6/ipv6.ko \ ,CONFIG_IPV6,,20,ipv6)) -$(eval $(call KMOD_template,PPP,ppp,\ - $(MODULES_DIR)/kernel/drivers/net/ppp_async.ko \ - $(MODULES_DIR)/kernel/drivers/net/ppp_generic.ko \ - $(MODULES_DIR)/kernel/drivers/net/slhc.ko \ - $(MODULES_DIR)/kernel/lib/crc-ccitt.ko \ -,CONFIG_PPP)) - -#$(eval $(call KMOD_template,MPPE,mppe,\ -# $(MODULES_DIR)/kernel/drivers/net/ppp_mppe_mppc.ko \ -#,CONFIG_PPP_MPPE_MPPC)) - -$(eval $(call KMOD_template,PPPOATM,pppoatm,\ - $(MODULES_DIR)/kernel/net/atm/pppoatm.ko \ -,CONFIG_PPPOATM)) - -$(eval $(call KMOD_template,PPPOE,pppoe,\ - $(MODULES_DIR)/kernel/drivers/net/pppoe.ko \ - $(MODULES_DIR)/kernel/drivers/net/pppox.ko \ -,CONFIG_PPPOE)) - $(eval $(call KMOD_template,SCHED,sched,\ $(MODULES_DIR)/kernel/net/sched/*.ko \ ,CONFIG_NET_SCHED)) -- cgit v1.2.3 From 06ab1b1080dbee3d0ea9edd7b960ea20ed8ae76a Mon Sep 17 00:00:00 2001 From: nbd Date: Mon, 31 Jul 2006 16:39:58 +0000 Subject: don't try to package ipt_SNAT and ipt_DNAT when making kernel module packages git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4354 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/netfilter.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/netfilter.mk b/include/netfilter.mk index d4ec0f391..ba1512e14 100644 --- a/include/netfilter.mk +++ b/include/netfilter.mk @@ -77,7 +77,9 @@ IPT_IPSEC-$(CONFIG_IP_NF_MATCH_AH) += $(P_V4)ipt_ah IPT_IPSEC-$(CONFIG_NETFILTER_XT_MATCH_ESP) += $(P_XT)xt_esp IPT_NAT-m := -IPT_NAT-$(CONFIG_IP_NF_NAT) += $(P_V4)ipt_SNAT $(P_V4)ipt_DNAT +ifneq ($(NF_KMOD),1) + IPT_NAT-$(CONFIG_IP_NF_NAT) += $(P_V4)ipt_SNAT $(P_V4)ipt_DNAT +endif IPT_NAT-$(CONFIG_IP_NF_TARGET_MASQUERADE) += $(P_V4)ipt_MASQUERADE IPT_NAT-$(CONFIG_IP_NF_TARGET_MIRROR) += $(P_V4)ipt_MIRROR IPT_NAT-$(CONFIG_IP_NF_TARGET_REDIRECT) += $(P_V4)ipt_REDIRECT -- cgit v1.2.3 From 0301816e6adecb7048afbd6ced732f48ff2ca46f Mon Sep 17 00:00:00 2001 From: mbm Date: Wed, 2 Aug 2006 12:07:14 +0000 Subject: minor makefile tweaks git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4393 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/package.mk | 57 +++++++++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 28 deletions(-) (limited to 'include') diff --git a/include/package.mk b/include/package.mk index cd1a33c48..3dc944dbf 100644 --- a/include/package.mk +++ b/include/package.mk @@ -40,19 +40,19 @@ define Build/DefaultTargets $(call Build/Compile) touch $$@ - $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed: $(PKG_BUILD_DIR)/.built + ifdef Build/InstallDev + $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/stampfiles $(call Build/InstallDev) touch $$@ - ifdef Build/InstallDev compile-targets: $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed endif package-clean: FORCE $(call Build/Clean) $(call Build/UninstallDev) - rm -f $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed + -rm -f $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed package-rebuild: FORCE @-rm -f $(PKG_BUILD_DIR)/.built @@ -89,9 +89,9 @@ define Package/Default endef define BuildIPKGVariable -pkg_$(subst .,_,$(subst -,_,$(1)))_$(2) = $$(Package/$(1)/$(2)) -export pkg_$(subst .,_,$(subst -,_,$(1))_$(2)) -$(1)_COMMANDS += if [ -n "$$$$$$$$pkg_$(subst .,_,$(subst -,_,$(1)))_$(2)" ]; then echo "$$$$$$$$pkg_$(subst .,_,$(subst -,_,$(1)))_$(2)" > $(2); fi; + pkg_$(subst .,_,$(subst -,_,$(1)))_$(2) = $$(Package/$(1)/$(2)) + export pkg_$(subst .,_,$(subst -,_,$(1))_$(2)) + $(1)_COMMANDS += if [ -n "$$$$$$$$pkg_$(subst .,_,$(subst -,_,$(1)))_$(2)" ]; then echo "$$$$$$$$pkg_$(subst .,_,$(subst -,_,$(1)))_$(2)" > $(2); fi; endef define BuildPackage @@ -132,29 +132,30 @@ define BuildPackage IDEPEND_$(1):=$$(strip $$(DEPENDS)) - DUMPINFO += \ + ifneq ($(DUMP),) + DUMPINFO += \ echo "Package: $(1)"; - ifneq ($(MENU),) - DUMPINFO += \ + ifneq ($(MENU),) + DUMPINFO += \ echo "Menu: $(MENU)"; - endif + endif - ifneq ($(SUBMENU),) - DUMPINFO += \ - echo "Submenu: $(SUBMENU)"; - ifneq ($(SUBMENUDEP),) + ifneq ($(SUBMENU),) DUMPINFO += \ + echo "Submenu: $(SUBMENU)"; + ifneq ($(SUBMENUDEP),) + DUMPINFO += \ echo "Submenu-Depends: $(SUBMENUDEP)"; + endif endif - endif - ifneq ($(DEFAULT),) - DUMPINFO += \ + ifneq ($(DEFAULT),) + DUMPINFO += \ echo "Default: $(DEFAULT)"; - endif + endif - DUMPINFO += \ + DUMPINFO += \ echo "Version: $(VERSION)"; \ echo "Depends: $$(IDEPEND_$(1))"; \ echo "Build-Depends: $(PKG_BUILDDEP)"; \ @@ -162,19 +163,20 @@ define BuildPackage echo "Title: $(TITLE)"; \ echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n,g'; - ifneq ($(URL),) - DUMPINFO += \ + ifneq ($(URL),) + DUMPINFO += \ echo; \ echo "$(URL)"; - endif + endif - DUMPINFO += \ + DUMPINFO += \ echo "@@"; - ifneq ($(CONFIG),) - DUMPINFO += \ + ifneq ($(CONFIG),) + DUMPINFO += \ echo "Config: $(CONFIG)" | sed -e 's,\\,\n,g'; \ echo "@@"; + endif endif $(eval $(call BuildIPKGVariable,$(1),conffiles)) @@ -182,7 +184,7 @@ define BuildPackage $(eval $(call BuildIPKGVariable,$(1),postinst)) $(eval $(call BuildIPKGVariable,$(1),prerm)) $(eval $(call BuildIPKGVariable,$(1),postrm)) - $$(IDIR_$(1))/CONTROL/control: Makefile $(PKG_BUILD_DIR)/.prepared $(PKG_BUILD_DIR)/.version-$(1)_$(VERSION)_$(PKGARCH) + $$(IDIR_$(1))/CONTROL/control: $(PKG_BUILD_DIR)/.version-$(1)_$(VERSION)_$(PKGARCH) mkdir -p $$(IDIR_$(1))/CONTROL echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control echo "Version: $(VERSION)" >> $$(IDIR_$(1))/CONTROL/control @@ -204,7 +206,7 @@ define BuildPackage $($(1)_COMMANDS) \ ) - $$(IPKG_$(1)): $$(IDIR_$(1))/CONTROL/control $(PKG_BUILD_DIR)/.built + $$(IPKG_$(1)): $(PKG_BUILD_DIR)/.built $$(IDIR_$(1))/CONTROL/control $(call Package/$(1)/install,$$(IDIR_$(1))) mkdir -p $(PACKAGE_DIR) -find $$(IDIR_$(1)) -name CVS | xargs rm -rf @@ -227,7 +229,6 @@ define BuildPackage @touch $$@ $$(eval $$(call Build/DefaultTargets,$(1))) - endef ifneq ($(strip $(PKG_CAT)),) -- cgit v1.2.3 From abbc6440741e747eb56f5b03d3df26df5e536864 Mon Sep 17 00:00:00 2001 From: mbm Date: Wed, 2 Aug 2006 13:40:11 +0000 Subject: fix CONFIG_ALL git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4397 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/package.mk b/include/package.mk index 3dc944dbf..fbd4cf714 100644 --- a/include/package.mk +++ b/include/package.mk @@ -19,7 +19,7 @@ define Build/DefaultTargets $(PKG_BUILD_DIR)/.prepared: package-clean endif - ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg $(IPKG_$(1)) $(PKG_BUILD_DIR)),$(IPKG_$(1))) + ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg -x ipkg-install $(IPKG_$(1)) $(PKG_BUILD_DIR) | tee /tmp/check_$(1)),$(IPKG_$(1))) $(PKG_BUILD_DIR)/.built: package-rebuild endif endif @@ -121,7 +121,7 @@ define BuildPackage install-targets: $$(INFO_$(1)) endif - ifneq ($(CONFIG_PACKAGE_$(1))$(DEVELOPER),) + ifneq ($(CONFIG_PACKAGE_$(1))$(CONFIG_ALL),) compile-targets: $$(IPKG_$(1)) endif endif -- cgit v1.2.3 From d8ced17f8b4963015c43b0084650231bef7bb565 Mon Sep 17 00:00:00 2001 From: mbm Date: Wed, 2 Aug 2006 13:57:33 +0000 Subject: correct [4397] git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4398 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/package.mk b/include/package.mk index fbd4cf714..b4b6538b6 100644 --- a/include/package.mk +++ b/include/package.mk @@ -121,7 +121,7 @@ define BuildPackage install-targets: $$(INFO_$(1)) endif - ifneq ($(CONFIG_PACKAGE_$(1))$(CONFIG_ALL),) + ifneq ($(CONFIG_PACKAGE_$(1)),) compile-targets: $$(IPKG_$(1)) endif endif -- cgit v1.2.3 From 65d0d163368643d566dceff9398d42653d51aecf Mon Sep 17 00:00:00 2001 From: mbm Date: Wed, 2 Aug 2006 14:34:35 +0000 Subject: remove debug line git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4400 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/package.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'include') diff --git a/include/package.mk b/include/package.mk index b4b6538b6..c0953ae70 100644 --- a/include/package.mk +++ b/include/package.mk @@ -19,13 +19,12 @@ define Build/DefaultTargets $(PKG_BUILD_DIR)/.prepared: package-clean endif - ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg -x ipkg-install $(IPKG_$(1)) $(PKG_BUILD_DIR) | tee /tmp/check_$(1)),$(IPKG_$(1))) + ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg -x ipkg-install $(IPKG_$(1)) $(PKG_BUILD_DIR)),$(IPKG_$(1))) $(PKG_BUILD_DIR)/.built: package-rebuild endif endif endif - $(PKG_BUILD_DIR)/.prepared: @-rm -rf $(PKG_BUILD_DIR) @mkdir -p $(PKG_BUILD_DIR) -- cgit v1.2.3 From 001227b7800328fe3db15d62e0948d25dfa596f6 Mon Sep 17 00:00:00 2001 From: mbm Date: Fri, 4 Aug 2006 05:30:27 +0000 Subject: more cleanup (make sure to pass TARGET_PATH and not just TARGET_CC) git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4432 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-build.mk | 4 ++-- include/package.mk | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 38ea9a18e..e3f2d5dae 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -66,7 +66,7 @@ else endif $(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.linux-compile pkg-install ramdisk-config - $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) + $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH="$(TARGET_PATH)" $(LINUX_KERNEL): $(LINUX_DIR)/vmlinux $(KERNEL_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $< $@ @@ -75,7 +75,7 @@ $(LINUX_KERNEL): $(LINUX_DIR)/vmlinux $(LINUX_DIR)/.modules_done: rm -rf $(KERNEL_BUILD_DIR)/modules $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH="$(TARGET_PATH)" modules - $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install + $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH="$(TARGET_PATH)" DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install touch $(LINUX_DIR)/.modules_done modules: $(LINUX_DIR)/.modules_done diff --git a/include/package.mk b/include/package.mk index c0953ae70..fee715043 100644 --- a/include/package.mk +++ b/include/package.mk @@ -285,7 +285,6 @@ endef define Build/Compile/Default $(MAKE) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ - CC=$(TARGET_CC) \ CROSS="$(TARGET_CROSS)" \ EXTRA_CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include" \ ARCH="$(ARCH)" \ -- cgit v1.2.3 From 96a116341a30bce09a7d4a45e37a02e07412f543 Mon Sep 17 00:00:00 2001 From: mbm Date: Fri, 4 Aug 2006 06:23:47 +0000 Subject: yet more cleanup (make sure to honor TARGET_CC and not just TARGET_CROSS) git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4433 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-build.mk | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'include') diff --git a/include/kernel-build.mk b/include/kernel-build.mk index e3f2d5dae..0f29a306b 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -33,11 +33,8 @@ $(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE) ifeq ($(KERNEL),2.4) $(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched - $(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" \ - $(LINUX_DIR)/Makefile \ - $(LINUX_DIR)/arch/*/Makefile $(SED) "s,\-mcpu=,\-mtune=,g;" $(LINUX_DIR)/arch/mips/Makefile - $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_KARCH) oldconfig include/linux/compile.h include/linux/version.h + PATH="$(TARGET_PATH)" $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(TARGET_CC)" ARCH=$(LINUX_KARCH) oldconfig include/linux/compile.h include/linux/version.h touch $@ $(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.configured @@ -47,7 +44,7 @@ $(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.configured $(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.depend_done else $(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched - $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) oldconfig prepare scripts + PATH="$(TARGET_PATH)" $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(TARGET_CC)" ARCH=$(LINUX_KARCH) oldconfig prepare scripts touch $@ endif @@ -66,16 +63,16 @@ else endif $(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.linux-compile pkg-install ramdisk-config - $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH="$(TARGET_PATH)" + PATH="$(TARGET_PATH)" $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(TARGET_CC)" ARCH=$(LINUX_KARCH) $(LINUX_KERNEL): $(LINUX_DIR)/vmlinux - $(KERNEL_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $< $@ + PATH="$(TARGET_PATH)" $(KERNEL_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $< $@ touch -c $(LINUX_KERNEL) $(LINUX_DIR)/.modules_done: rm -rf $(KERNEL_BUILD_DIR)/modules - $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH="$(TARGET_PATH)" modules - $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH="$(TARGET_PATH)" DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install + PATH="$(TARGET_PATH)" $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(TARGET_CC)" ARCH=$(LINUX_KARCH) modules + PATH="$(TARGET_PATH)" $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(TARGET_CC)" ARCH=$(LINUX_KARCH) DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install touch $(LINUX_DIR)/.modules_done modules: $(LINUX_DIR)/.modules_done -- cgit v1.2.3 From 5d099491cf5469749a3961291b621429aeee0070 Mon Sep 17 00:00:00 2001 From: mbm Date: Fri, 4 Aug 2006 09:14:20 +0000 Subject: fix everything I broke with the previous patches git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4436 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/package.mk b/include/package.mk index fee715043..79c29bccf 100644 --- a/include/package.mk +++ b/include/package.mk @@ -283,7 +283,7 @@ define Build/Configure endef define Build/Compile/Default - $(MAKE) -C $(PKG_BUILD_DIR) \ + PATH=$(TARGET_PATH) $(MAKE) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ CROSS="$(TARGET_CROSS)" \ EXTRA_CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include" \ -- cgit v1.2.3 From ef998d64e381ed0a92fc73edf4206f7be7335caf Mon Sep 17 00:00:00 2001 From: mbm Date: Fri, 4 Aug 2006 11:59:52 +0000 Subject: set PATH in rules.mk git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4438 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-build.mk | 12 ++++++------ include/package.mk | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'include') diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 0f29a306b..9af1142d3 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -34,7 +34,7 @@ $(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE) ifeq ($(KERNEL),2.4) $(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched $(SED) "s,\-mcpu=,\-mtune=,g;" $(LINUX_DIR)/arch/mips/Makefile - PATH="$(TARGET_PATH)" $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(TARGET_CC)" ARCH=$(LINUX_KARCH) oldconfig include/linux/compile.h include/linux/version.h + $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(TARGET_CC)" ARCH=$(LINUX_KARCH) oldconfig include/linux/compile.h include/linux/version.h touch $@ $(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.configured @@ -44,7 +44,7 @@ $(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.configured $(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.depend_done else $(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched - PATH="$(TARGET_PATH)" $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(TARGET_CC)" ARCH=$(LINUX_KARCH) oldconfig prepare scripts + $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(TARGET_CC)" ARCH=$(LINUX_KARCH) oldconfig prepare scripts touch $@ endif @@ -63,16 +63,16 @@ else endif $(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.linux-compile pkg-install ramdisk-config - PATH="$(TARGET_PATH)" $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(TARGET_CC)" ARCH=$(LINUX_KARCH) + $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(TARGET_CC)" ARCH=$(LINUX_KARCH) $(LINUX_KERNEL): $(LINUX_DIR)/vmlinux - PATH="$(TARGET_PATH)" $(KERNEL_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $< $@ + $(KERNEL_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $< $@ touch -c $(LINUX_KERNEL) $(LINUX_DIR)/.modules_done: rm -rf $(KERNEL_BUILD_DIR)/modules - PATH="$(TARGET_PATH)" $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(TARGET_CC)" ARCH=$(LINUX_KARCH) modules - PATH="$(TARGET_PATH)" $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(TARGET_CC)" ARCH=$(LINUX_KARCH) DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install + $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(TARGET_CC)" ARCH=$(LINUX_KARCH) modules + $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(TARGET_CC)" ARCH=$(LINUX_KARCH) DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install touch $(LINUX_DIR)/.modules_done modules: $(LINUX_DIR)/.modules_done diff --git a/include/package.mk b/include/package.mk index 79c29bccf..385a84653 100644 --- a/include/package.mk +++ b/include/package.mk @@ -251,11 +251,11 @@ endef define Build/Configure/Default @(cd $(PKG_BUILD_DIR)/$(3); \ [ -x configure ] && \ - $(2) \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS)" \ CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ + $(2) \ ./configure \ --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ @@ -283,7 +283,7 @@ define Build/Configure endef define Build/Compile/Default - PATH=$(TARGET_PATH) $(MAKE) -C $(PKG_BUILD_DIR) \ + $(MAKE) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ CROSS="$(TARGET_CROSS)" \ EXTRA_CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include" \ -- cgit v1.2.3 From 150b0c9cabdc88d533dde0a019e3edf060dff7d3 Mon Sep 17 00:00:00 2001 From: mbm Date: Fri, 4 Aug 2006 20:46:47 +0000 Subject: automatically turn off colors git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4454 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/verbose.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/verbose.mk b/include/verbose.mk index 525fbf1c1..36002aee9 100644 --- a/include/verbose.mk +++ b/include/verbose.mk @@ -18,13 +18,18 @@ ifeq ("$(origin V)", "command line") KBUILD_VERBOSE:=$(V) endif +ifneq ($(shell tty -s <&3 || echo x),x) + _Y:="\\33[33m"# yellow + _N:="\\33[m"# normal +endif + ifneq ($(KBUILD_VERBOSE),99) ifeq ($(QUIET),1) $(MAKECMDGOALS): trace trace: FORCE @[ -f "$(MAKECMDGOALS)" ] || { \ [ -z "$${PWD##$$TOPDIR}" ] || DIR=" -C $${PWD##$$TOPDIR/}"; \ - echo -e "\33[33mmake[$$(($(MAKELEVEL)+1))]$$DIR $(MAKECMDGOALS)\33[m" >&3; \ + echo -e "$(_Y)make[$$(($(MAKELEVEL)+1))]$$DIR $(MAKECMDGOALS)$(_N)" >&3; \ } else export QUIET:=1 -- cgit v1.2.3 From 510d4e251f9eeb077d299318af7c2447b480f552 Mon Sep 17 00:00:00 2001 From: florian Date: Sat, 5 Aug 2006 00:55:41 +0000 Subject: Force remove of the symbolic link build_arm/linux, especially when switching from targets using the same toolchain (ex : switching from brcm-2.4 to au1000-2.6) git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4462 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-build.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 9af1142d3..bf6f2c2ec 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -79,6 +79,7 @@ modules: $(LINUX_DIR)/.modules_done packages: $(TARGETS) $(LINUX_DIR)/.linux-compile: + @rm -f $(BUILD_DIR)/linux ln -sf $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) $(BUILD_DIR)/linux @$(MAKE) modules @$(MAKE) packages -- cgit v1.2.3 From a1b10a937911205c5239bc98a057c0a88523b66a Mon Sep 17 00:00:00 2001 From: nico Date: Thu, 10 Aug 2006 11:16:46 +0000 Subject: fix uml-2.6 (closes: #678) git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4551 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-build.mk | 10 +++++----- include/kernel.mk | 8 ++++++-- 2 files changed, 11 insertions(+), 7 deletions(-) (limited to 'include') diff --git a/include/kernel-build.mk b/include/kernel-build.mk index bf6f2c2ec..a8c9e7fd2 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -34,7 +34,7 @@ $(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE) ifeq ($(KERNEL),2.4) $(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched $(SED) "s,\-mcpu=,\-mtune=,g;" $(LINUX_DIR)/arch/mips/Makefile - $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(TARGET_CC)" ARCH=$(LINUX_KARCH) oldconfig include/linux/compile.h include/linux/version.h + $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) oldconfig include/linux/compile.h include/linux/version.h touch $@ $(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.configured @@ -44,7 +44,7 @@ $(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.configured $(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.depend_done else $(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched - $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(TARGET_CC)" ARCH=$(LINUX_KARCH) oldconfig prepare scripts + $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) oldconfig prepare scripts touch $@ endif @@ -63,7 +63,7 @@ else endif $(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.linux-compile pkg-install ramdisk-config - $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(TARGET_CC)" ARCH=$(LINUX_KARCH) + $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) $(LINUX_KERNEL): $(LINUX_DIR)/vmlinux $(KERNEL_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $< $@ @@ -71,8 +71,8 @@ $(LINUX_KERNEL): $(LINUX_DIR)/vmlinux $(LINUX_DIR)/.modules_done: rm -rf $(KERNEL_BUILD_DIR)/modules - $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(TARGET_CC)" ARCH=$(LINUX_KARCH) modules - $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(TARGET_CC)" ARCH=$(LINUX_KARCH) DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install + $(MAKE) -C "$(LINUX_DIR)" CC="$(KERNEL_CC)" CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) modules + $(MAKE) -C "$(LINUX_DIR)" CC="$(KERNEL_CC)" CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install touch $(LINUX_DIR)/.modules_done modules: $(LINUX_DIR)/.modules_done diff --git a/include/kernel.mk b/include/kernel.mk index 318ca6869..db02ea216 100644 --- a/include/kernel.mk +++ b/include/kernel.mk @@ -29,8 +29,12 @@ LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \ ) ifneq (,$(findstring uml,$(BOARD))) -LINUX_KARCH="um" -KERNEL_CROSS= + LINUX_KARCH:=um + KERNEL_CC:=$(HOSTCC) + KERNEL_CROSS:= +else + KERNEL_CC:=$(TARGET_CC) + KERNEL_CROSS:=$(TARGET_CROSS) endif KERNEL_BUILD_DIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD) -- cgit v1.2.3 From efb7973b295ae6a75bb728a4f7eaae1385f3ebb2 Mon Sep 17 00:00:00 2001 From: groz Date: Mon, 14 Aug 2006 07:41:23 +0000 Subject: Make ext2 image larger for uml, update uml kernel config git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4567 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/image.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/image.mk b/include/image.mk index ba3cfb8af..660734c9f 100644 --- a/include/image.mk +++ b/include/image.mk @@ -47,7 +47,7 @@ ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) ifeq ($(CONFIG_TARGET_ROOTFS_EXT2FS),y) define Image/mkfs/ext2 - $(STAGING_DIR)/bin/genext2fs -q -b 4096 -I 1500 -d $(BUILD_DIR)/root/ $(KDIR)/root.ext2 + $(STAGING_DIR)/bin/genext2fs -q -b 8192 -I 1500 -d $(BUILD_DIR)/root/ $(KDIR)/root.ext2 $(call Image/Build,ext2) endef endif -- cgit v1.2.3 From 5fceb48d5206e92a3dbbdede5fe57bf9fa7e18a9 Mon Sep 17 00:00:00 2001 From: groz Date: Mon, 14 Aug 2006 08:16:47 +0000 Subject: Move a bunch of ethernet hardware drivers to new kernel module packageing git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4569 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/modules-2.4.mk | 4 ---- include/modules-2.6.mk | 8 -------- 2 files changed, 12 deletions(-) (limited to 'include') diff --git a/include/modules-2.4.mk b/include/modules-2.4.mk index 8e7d2308a..b00b61c83 100644 --- a/include/modules-2.4.mk +++ b/include/modules-2.4.mk @@ -130,10 +130,6 @@ $(eval $(call KMOD_template,NET_HERMES_PCI,net-hermes-plx,\ $(MODULES_DIR)/kernel/drivers/net/wireless/orinoco_plx.o \ ,CONFIG_PLX_HERMES,kmod-net-hermes,11,orinoco_plx)) -$(eval $(call KMOD_template,NET_NATSEMI,net-natsemi,\ - $(MODULES_DIR)/kernel/drivers/net/natsemi.o \ -,CONFIG_NATSEMI,,10,natsemi)) - $(eval $(call KMOD_template,NET_PRISM54,net-prism54,\ $(MODULES_DIR)/kernel/drivers/net/wireless/prism54/prism54.o \ ,CONFIG_PRISM54,,10,prism54)) diff --git a/include/modules-2.6.mk b/include/modules-2.6.mk index 533a4c956..a0ff900aa 100644 --- a/include/modules-2.6.mk +++ b/include/modules-2.6.mk @@ -134,10 +134,6 @@ $(eval $(call KMOD_template,NET_3C59X,net-3c59x,\ $(MODULES_DIR)/kernel/drivers/net/3c59x.ko \ ,CONFIG_VORTEX,,10,3c59x)) -$(eval $(call KMOD_template,NET_8139TOO,net-8139too,\ - $(MODULES_DIR)/kernel/drivers/net/8139too.ko \ -,CONFIG_8139TOO,,10,8139too)) - $(eval $(call KMOD_template,NET_AIRO,net-airo,\ $(MODULES_DIR)/kernel/drivers/net/wireless/airo.ko \ ,CONFIG_AIRO,,10,airo)) @@ -159,10 +155,6 @@ $(eval $(call KMOD_template,NET_HERMES_PCI,net-hermes-plx,\ $(MODULES_DIR)/kernel/drivers/net/wireless/orinoco_plx.ko \ ,CONFIG_PLX_HERMES,kmod-net-hermes,11,orinoco_plx)) -$(eval $(call KMOD_template,NET_NATSEMI,net-natsemi,\ - $(MODULES_DIR)/kernel/drivers/net/natsemi.ko \ -,CONFIG_NATSEMI,,10,natsemi)) - $(eval $(call KMOD_template,NET_PRISM54,net-prism54,\ $(MODULES_DIR)/kernel/drivers/net/wireless/prism54/prism54.ko \ ,CONFIG_PRISM54,,10,prism54)) -- cgit v1.2.3 From 7c79debf2cb44333e52025ee5b276c2c5d2c99c0 Mon Sep 17 00:00:00 2001 From: mbm Date: Wed, 16 Aug 2006 00:35:30 +0000 Subject: fix issues if kernel config is changed after the compile has started git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4570 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-build.mk | 9 +++---- include/kernel.mk | 62 ++++++++++++++++++++++++++++--------------------- 2 files changed, 41 insertions(+), 30 deletions(-) (limited to 'include') diff --git a/include/kernel-build.mk b/include/kernel-build.mk index a8c9e7fd2..665f0ff74 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -94,10 +94,11 @@ $(KERNEL_IPKG): fi $(IPKG_BUILD) $(KERNEL_IDIR) $(KERNEL_BUILD_DIR) -$(TOPDIR)/.kernel.mk: - echo "BOARD:=$(BOARD)" > $@ - echo "LINUX_VERSION:=$(LINUX_VERSION)" >> $@ - echo "LINUX_RELEASE:=$(LINUX_RELEASE)" >> $@ +$(TOPDIR)/.kernel.mk: $(TOPDIR)/target/linux/$(BOARD)-$(KERNEL)/Makefile + echo "CONFIG_BOARD:=$(BOARD)" > $@ + echo "CONFIG_KERNEL:=$(KERNEL)" >> $@ + echo "CONFIG_LINUX_VERSION:=$(LINUX_VERSION)" >> $@ + echo "CONFIG_LINUX_RELEASE:=$(LINUX_RELEASE)" >> $@ pkg-install: FORCE @for pkg in $(INSTALL_TARGETS); do \ diff --git a/include/kernel.mk b/include/kernel.mk index db02ea216..7b959eaea 100644 --- a/include/kernel.mk +++ b/include/kernel.mk @@ -9,43 +9,53 @@ ifeq ($(DUMP),1) BOARD:= LINUX_VERSION:= else --include $(TOPDIR)/.kernel.mk -ifneq (,$(findstring 2.4.,$(LINUX_VERSION))) -KERNEL:=2.4 -LINUX_KMOD_SUFFIX=o -endif -ifneq (,$(findstring 2.6.,$(LINUX_VERSION))) -KERNEL:=2.6 -LINUX_KMOD_SUFFIX=ko -endif + include $(TOPDIR)/.kernel.mk + include $(INCLUDE_DIR)/target.mk + + # check to see if .kernel.mk matches target.mk + ifeq ($(CONFIG_BOARD)-$(CONFIG_KERNEL),$(BOARD)-$(KERNEL)) + LINUX_VERSION:=$(CONFIG_LINUX_VERSION) + RELEASE:=$(CONFIG_RELEASE) + else + # oops, old .kernel.config; rebuild it (hiding the misleading errors this produces) + $(warning rebuilding .kernel.mk) + $(TOPDIR)/.kernel.mk: FORCE + @$(MAKE) -C $(TOPDIR)/target/linux/$(BOARD)-$(KERNEL) $@ &>/dev/null + endif -LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \ + ifeq ($(KERNEL),2.6) + LINUX_KMOD_SUFFIX=ko + else + LINUX_KMOD_SUFFIX=o + endif + + LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \ -e 's/mipsel/mips/' \ -e 's/mipseb/mips/' \ -e 's/powerpc/ppc/' \ -e 's/sh[234]/sh/' \ -e 's/armeb/arm/' \ -) + ) -ifneq (,$(findstring uml,$(BOARD))) - LINUX_KARCH:=um - KERNEL_CC:=$(HOSTCC) - KERNEL_CROSS:= -else - KERNEL_CC:=$(TARGET_CC) - KERNEL_CROSS:=$(TARGET_CROSS) -endif + ifneq (,$(findstring uml,$(BOARD))) + LINUX_KARCH:=um + KERNEL_CC:=$(HOSTCC) + KERNEL_CROSS:= + else + KERNEL_CC:=$(TARGET_CC) + KERNEL_CROSS:=$(TARGET_CROSS) + endif -KERNEL_BUILD_DIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD) -LINUX_DIR := $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) + KERNEL_BUILD_DIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD) + LINUX_DIR := $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) -MODULES_SUBDIR:=lib/modules/$(LINUX_VERSION) -MODULES_DIR := $(KERNEL_BUILD_DIR)/modules/$(MODULES_SUBDIR) -TARGET_MODULES_DIR := $(LINUX_TARGET_DIR)/$(MODULES_SUBDIR) -KMOD_BUILD_DIR := $(KERNEL_BUILD_DIR)/linux-modules + MODULES_SUBDIR:=lib/modules/$(LINUX_VERSION) + MODULES_DIR := $(KERNEL_BUILD_DIR)/modules/$(MODULES_SUBDIR) + TARGET_MODULES_DIR := $(LINUX_TARGET_DIR)/$(MODULES_SUBDIR) + KMOD_BUILD_DIR := $(KERNEL_BUILD_DIR)/linux-modules -LINUX_KERNEL:=$(KERNEL_BUILD_DIR)/vmlinux + LINUX_KERNEL:=$(KERNEL_BUILD_DIR)/vmlinux endif # FIXME: remove this crap -- cgit v1.2.3 From c6753b594214c24fa26458539a74e82aa75e053e Mon Sep 17 00:00:00 2001 From: mbm Date: Wed, 16 Aug 2006 23:43:56 +0000 Subject: Show error messages when collecting the package info git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4573 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/package.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include') diff --git a/include/package.mk b/include/package.mk index 385a84653..43f175890 100644 --- a/include/package.mk +++ b/include/package.mk @@ -16,10 +16,12 @@ define Build/DefaultTargets ifeq ($(DUMP),) ifeq ($(CONFIG_AUTOREBUILD),y) ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) .),$(PKG_BUILD_DIR)) + $$(warning package has changed, need to rebuild $(subst $(TOPDIR)/,,$(PKG_BUILD_DIR))) $(PKG_BUILD_DIR)/.prepared: package-clean endif ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg -x ipkg-install $(IPKG_$(1)) $(PKG_BUILD_DIR)),$(IPKG_$(1))) + $$(warning $(subst $(TOPDIR)/,,$(PKG_BUILD_DIR)) has changed, need to rebuild $(subst $(TOPDIR)/,,$(IPKG_$(1)))) $(PKG_BUILD_DIR)/.built: package-rebuild endif endif -- cgit v1.2.3 From ba906d9e770b2bbd5a074195568e357ac7122d55 Mon Sep 17 00:00:00 2001 From: mbm Date: Thu, 17 Aug 2006 00:12:03 +0000 Subject: fix accidental tab git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4577 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/package.mk b/include/package.mk index 43f175890..0847528b7 100644 --- a/include/package.mk +++ b/include/package.mk @@ -16,12 +16,12 @@ define Build/DefaultTargets ifeq ($(DUMP),) ifeq ($(CONFIG_AUTOREBUILD),y) ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) .),$(PKG_BUILD_DIR)) - $$(warning package has changed, need to rebuild $(subst $(TOPDIR)/,,$(PKG_BUILD_DIR))) + $$(warning package has changed, need to rebuild $(subst $(TOPDIR)/,,$(PKG_BUILD_DIR))) $(PKG_BUILD_DIR)/.prepared: package-clean endif ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg -x ipkg-install $(IPKG_$(1)) $(PKG_BUILD_DIR)),$(IPKG_$(1))) - $$(warning $(subst $(TOPDIR)/,,$(PKG_BUILD_DIR)) has changed, need to rebuild $(subst $(TOPDIR)/,,$(IPKG_$(1)))) + $$(warning $(subst $(TOPDIR)/,,$(PKG_BUILD_DIR)) has changed, need to rebuild $(subst $(TOPDIR)/,,$(IPKG_$(1)))) $(PKG_BUILD_DIR)/.built: package-rebuild endif endif -- cgit v1.2.3 From 282f9ebaca8fb2e095105f213a4b5a89a497cad0 Mon Sep 17 00:00:00 2001 From: mbm Date: Thu, 17 Aug 2006 00:33:27 +0000 Subject: tidy up output git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4578 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/package.mk | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/package.mk b/include/package.mk index 0847528b7..332833272 100644 --- a/include/package.mk +++ b/include/package.mk @@ -15,15 +15,20 @@ include $(INCLUDE_DIR)/prereq.mk define Build/DefaultTargets ifeq ($(DUMP),) ifeq ($(CONFIG_AUTOREBUILD),y) + _INFO:= ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) .),$(PKG_BUILD_DIR)) - $$(warning package has changed, need to rebuild $(subst $(TOPDIR)/,,$(PKG_BUILD_DIR))) + _INFO+=$(subst $(TOPDIR)/,,$(PKG_BUILD_DIR)) $(PKG_BUILD_DIR)/.prepared: package-clean endif ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg -x ipkg-install $(IPKG_$(1)) $(PKG_BUILD_DIR)),$(IPKG_$(1))) - $$(warning $(subst $(TOPDIR)/,,$(PKG_BUILD_DIR)) has changed, need to rebuild $(subst $(TOPDIR)/,,$(IPKG_$(1)))) + _INFO+=$(subst $(TOPDIR)/,,$(IPKG_$(1))) $(PKG_BUILD_DIR)/.built: package-rebuild endif + + ifneq ($(MAKECMDGOALS),prereq) + $$(info Rebuilding $$(_INFO)) + endif endif endif -- cgit v1.2.3 From dc8f7b0692f74559101fd004b744415384b932fd Mon Sep 17 00:00:00 2001 From: groz Date: Thu, 17 Aug 2006 07:20:08 +0000 Subject: Build bzImage for x86 builds - allow ext2 images even if initramfs used, they are needed for creating boot images git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4579 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/image.mk | 12 +++++++----- include/kernel-build.mk | 2 +- include/kernel.mk | 5 +++++ 3 files changed, 13 insertions(+), 6 deletions(-) (limited to 'include') diff --git a/include/image.mk b/include/image.mk index 660734c9f..903c27ba6 100644 --- a/include/image.mk +++ b/include/image.mk @@ -45,15 +45,17 @@ ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) endef endif - ifeq ($(CONFIG_TARGET_ROOTFS_EXT2FS),y) - define Image/mkfs/ext2 + +endif + +ifeq ($(CONFIG_TARGET_ROOTFS_EXT2FS),y) + define Image/mkfs/ext2 $(STAGING_DIR)/bin/genext2fs -q -b 8192 -I 1500 -d $(BUILD_DIR)/root/ $(KDIR)/root.ext2 $(call Image/Build,ext2) - endef - endif - + endef endif + define Image/mkfs/prepare/default find $(BUILD_DIR)/root -type f -not -perm +0100 | xargs chmod 0644 find $(BUILD_DIR)/root -type f -perm +0100 | xargs chmod 0755 diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 665f0ff74..8400bd2f1 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -63,7 +63,7 @@ else endif $(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.linux-compile pkg-install ramdisk-config - $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) + $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) $(KERNELNAME) $(LINUX_KERNEL): $(LINUX_DIR)/vmlinux $(KERNEL_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $< $@ diff --git a/include/kernel.mk b/include/kernel.mk index 7b959eaea..4b5fe72f0 100644 --- a/include/kernel.mk +++ b/include/kernel.mk @@ -38,6 +38,11 @@ else -e 's/armeb/arm/' \ ) + KERNELNAME="" + ifneq (,$(findstring x86,$(BOARD))) + KERNELNAME="bzImage" + endif + ifneq (,$(findstring uml,$(BOARD))) LINUX_KARCH:=um KERNEL_CC:=$(HOSTCC) -- cgit v1.2.3 From 6ba80de972c5394222649b7fd01bd604ac7bfdd5 Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 17 Aug 2006 18:11:25 +0000 Subject: fix KERNELNAME git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4584 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/kernel.mk b/include/kernel.mk index 4b5fe72f0..7c23aaca8 100644 --- a/include/kernel.mk +++ b/include/kernel.mk @@ -38,7 +38,7 @@ else -e 's/armeb/arm/' \ ) - KERNELNAME="" + KERNELNAME= ifneq (,$(findstring x86,$(BOARD))) KERNELNAME="bzImage" endif -- cgit v1.2.3 From 08b337878ad6e80ae7ba3282370c551deee13bb8 Mon Sep 17 00:00:00 2001 From: nico Date: Fri, 18 Aug 2006 01:18:24 +0000 Subject: cosmetic coherency fix git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4588 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-build.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 8400bd2f1..5e4534281 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -71,8 +71,8 @@ $(LINUX_KERNEL): $(LINUX_DIR)/vmlinux $(LINUX_DIR)/.modules_done: rm -rf $(KERNEL_BUILD_DIR)/modules - $(MAKE) -C "$(LINUX_DIR)" CC="$(KERNEL_CC)" CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) modules - $(MAKE) -C "$(LINUX_DIR)" CC="$(KERNEL_CC)" CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install + $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) modules + $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" CC="$(KERNEL_CC)" ARCH=$(LINUX_KARCH) DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install touch $(LINUX_DIR)/.modules_done modules: $(LINUX_DIR)/.modules_done -- cgit v1.2.3 From 219cb829cb3aca742c41fbfa7b54ed681afba986 Mon Sep 17 00:00:00 2001 From: groz Date: Fri, 18 Aug 2006 12:39:49 +0000 Subject: Update for initramfs handling git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4591 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-build.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 5e4534281..0ef00de35 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -57,6 +57,7 @@ ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) echo 'CONFIG_INITRAMFS_ROOT_GID=0' >> $(LINUX_DIR)/.config mkdir -p $(BUILD_DIR)/root/etc/init.d $(CP) ../generic-2.6/files/init $(BUILD_DIR)/root/ + $(CP) ../generic-2.6/files/postinit $(BUILD_DIR)/root/ else rm -f $(BUILD_DIR)/root/init $(BUILD_DIR)/root/etc/init.d/S00initramfs echo 'CONFIG_INITRAMFS_SOURCE=""' >> $(LINUX_DIR)/.config -- cgit v1.2.3 From 215b753c0018d4a43191b9ba565dfd7e28469b3a Mon Sep 17 00:00:00 2001 From: nbd Date: Fri, 18 Aug 2006 14:44:30 +0000 Subject: remove reference to missing file git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4595 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-build.mk | 1 - 1 file changed, 1 deletion(-) (limited to 'include') diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 0ef00de35..5e4534281 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -57,7 +57,6 @@ ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) echo 'CONFIG_INITRAMFS_ROOT_GID=0' >> $(LINUX_DIR)/.config mkdir -p $(BUILD_DIR)/root/etc/init.d $(CP) ../generic-2.6/files/init $(BUILD_DIR)/root/ - $(CP) ../generic-2.6/files/postinit $(BUILD_DIR)/root/ else rm -f $(BUILD_DIR)/root/init $(BUILD_DIR)/root/etc/init.d/S00initramfs echo 'CONFIG_INITRAMFS_SOURCE=""' >> $(LINUX_DIR)/.config -- cgit v1.2.3 From 4c66f72328d338b0e6f01c9cadc3cc0fe26ae2e0 Mon Sep 17 00:00:00 2001 From: groz Date: Fri, 18 Aug 2006 19:39:51 +0000 Subject: handle postinit for initramfs git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4601 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-build.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 5e4534281..0ef00de35 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -57,6 +57,7 @@ ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) echo 'CONFIG_INITRAMFS_ROOT_GID=0' >> $(LINUX_DIR)/.config mkdir -p $(BUILD_DIR)/root/etc/init.d $(CP) ../generic-2.6/files/init $(BUILD_DIR)/root/ + $(CP) ../generic-2.6/files/postinit $(BUILD_DIR)/root/ else rm -f $(BUILD_DIR)/root/init $(BUILD_DIR)/root/etc/init.d/S00initramfs echo 'CONFIG_INITRAMFS_SOURCE=""' >> $(LINUX_DIR)/.config -- cgit v1.2.3 From f3e536a67fae43a05ad21f99c2a29c23debfbd2f Mon Sep 17 00:00:00 2001 From: groz Date: Fri, 18 Aug 2006 22:38:20 +0000 Subject: Remove postinit stuff for initramfs git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4605 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-build.mk | 1 - 1 file changed, 1 deletion(-) (limited to 'include') diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 0ef00de35..5e4534281 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -57,7 +57,6 @@ ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) echo 'CONFIG_INITRAMFS_ROOT_GID=0' >> $(LINUX_DIR)/.config mkdir -p $(BUILD_DIR)/root/etc/init.d $(CP) ../generic-2.6/files/init $(BUILD_DIR)/root/ - $(CP) ../generic-2.6/files/postinit $(BUILD_DIR)/root/ else rm -f $(BUILD_DIR)/root/init $(BUILD_DIR)/root/etc/init.d/S00initramfs echo 'CONFIG_INITRAMFS_SOURCE=""' >> $(LINUX_DIR)/.config -- cgit v1.2.3 From 95073162473b4b7c7da92ebaa51c7704647f1e2c Mon Sep 17 00:00:00 2001 From: nbd Date: Sun, 20 Aug 2006 17:27:24 +0000 Subject: port kmod-ipv6 to the new system git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4615 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/modules-2.4.mk | 4 ---- include/modules-2.6.mk | 4 ---- 2 files changed, 8 deletions(-) (limited to 'include') diff --git a/include/modules-2.4.mk b/include/modules-2.4.mk index b00b61c83..7ef332363 100644 --- a/include/modules-2.4.mk +++ b/include/modules-2.4.mk @@ -21,10 +21,6 @@ $(eval $(call KMOD_template,IPIP,ipip,\ $(MODULES_DIR)/kernel/net/ipv4/ipip.o \ ,CONFIG_NET_IPIP,,60,ipip)) -$(eval $(call KMOD_template,IPV6,ipv6,\ - $(MODULES_DIR)/kernel/net/ipv6/ipv6.o \ -,CONFIG_IPV6,,20,ipv6)) - $(eval $(call KMOD_template,SCHED,sched,\ $(MODULES_DIR)/kernel/net/sched/*.o \ )) diff --git a/include/modules-2.6.mk b/include/modules-2.6.mk index a0ff900aa..4ea28fb16 100644 --- a/include/modules-2.6.mk +++ b/include/modules-2.6.mk @@ -23,10 +23,6 @@ $(eval $(call KMOD_template,IPIP,ipip,\ $(MODULES_DIR)/kernel/net/ipv4/ipip.ko \ ,CONFIG_NET_IPIP,,60,ipip)) -$(eval $(call KMOD_template,IPV6,ipv6,\ - $(MODULES_DIR)/kernel/net/ipv6/ipv6.ko \ -,CONFIG_IPV6,,20,ipv6)) - $(eval $(call KMOD_template,SCHED,sched,\ $(MODULES_DIR)/kernel/net/sched/*.ko \ ,CONFIG_NET_SCHED)) -- cgit v1.2.3 From eb3a7eb2fcbedb7b831227d413270baf7641bbd2 Mon Sep 17 00:00:00 2001 From: florian Date: Tue, 22 Aug 2006 12:40:33 +0000 Subject: Port kmod-gre to the new module layout git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4630 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/modules-2.6.mk | 4 ---- 1 file changed, 4 deletions(-) (limited to 'include') diff --git a/include/modules-2.6.mk b/include/modules-2.6.mk index 4ea28fb16..70a1fcc23 100644 --- a/include/modules-2.6.mk +++ b/include/modules-2.6.mk @@ -15,10 +15,6 @@ $(eval $(call KMOD_template,ATM,atm,\ $(MODULES_DIR)/kernel/drivers/atm/atmtcp.ko \ ,CONFIG_ATM,,50,atm)) -$(eval $(call KMOD_template,GRE,gre,\ - $(MODULES_DIR)/kernel/net/ipv4/ip_gre.ko \ -,CONFIG_NET_IPGRE)) - $(eval $(call KMOD_template,IPIP,ipip,\ $(MODULES_DIR)/kernel/net/ipv4/ipip.ko \ ,CONFIG_NET_IPIP,,60,ipip)) -- cgit v1.2.3 From 8c98ba00748ab50df318a4cdff64ad31d7c7a43e Mon Sep 17 00:00:00 2001 From: florian Date: Tue, 22 Aug 2006 19:43:53 +0000 Subject: Port kmod-tun to the new module layout git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4633 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/modules-2.6.mk | 4 ---- 1 file changed, 4 deletions(-) (limited to 'include') diff --git a/include/modules-2.6.mk b/include/modules-2.6.mk index 70a1fcc23..08ac4da81 100644 --- a/include/modules-2.6.mk +++ b/include/modules-2.6.mk @@ -23,10 +23,6 @@ $(eval $(call KMOD_template,SCHED,sched,\ $(MODULES_DIR)/kernel/net/sched/*.ko \ ,CONFIG_NET_SCHED)) -$(eval $(call KMOD_template,TUN,tun,\ - $(MODULES_DIR)/kernel/drivers/net/tun.ko \ -,CONFIG_TUN,,20,tun)) - # Block devices $(eval $(call KMOD_template,LOOP,loop,\ -- cgit v1.2.3 From be9200761382504a7ad0fad4c7a14f8b0f92ce49 Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 24 Aug 2006 18:49:51 +0000 Subject: add prereq check to prevent people from building openwrt as root git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4655 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/prereq-build.mk | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'include') diff --git a/include/prereq-build.mk b/include/prereq-build.mk index a6de9b270..e90c3157b 100644 --- a/include/prereq-build.mk +++ b/include/prereq-build.mk @@ -8,6 +8,13 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/prereq.mk +define Require/non-root + [ "$$(shell whoami)" != "root" ] +endef +$(eval $(call Require,non-root, \ + Building OpenWrt as root is not supported! \ +)) + # Required for the toolchain define Require/working-make echo 'all: test' > $(TMP_DIR)/check.mk -- cgit v1.2.3 From 3f494f8d220f2b1a40a6749e814b46eca48792ac Mon Sep 17 00:00:00 2001 From: kaloz Date: Fri, 25 Aug 2006 21:53:54 +0000 Subject: add basic support for the Magicbox boards git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4672 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel.mk | 3 +++ include/target.mk | 1 + 2 files changed, 4 insertions(+) (limited to 'include') diff --git a/include/kernel.mk b/include/kernel.mk index 7c23aaca8..c788bf1c4 100644 --- a/include/kernel.mk +++ b/include/kernel.mk @@ -42,6 +42,9 @@ else ifneq (,$(findstring x86,$(BOARD))) KERNELNAME="bzImage" endif + ifneq (,$(findstring ppc,$(BOARD))) + KERNELNAME="uImage" + endif ifneq (,$(findstring uml,$(BOARD))) LINUX_KARCH:=um diff --git a/include/target.mk b/include/target.mk index 95bd1dbfb..449def932 100644 --- a/include/target.mk +++ b/include/target.mk @@ -23,6 +23,7 @@ $(eval $(call kernel_template,2.4,ar531x,2_4_AR531X)) $(eval $(call kernel_template,2.6,aruba,2_6_ARUBA)) $(eval $(call kernel_template,2.6,au1000,2_6_AU1000)) $(eval $(call kernel_template,2.6,xscale,2_6_XSCALE)) +$(eval $(call kernel_template,2.6,magicbox,2_6_MAGICBOX)) $(eval $(call kernel_template,2.6,sibyte,2_6_SIBYTE)) export BOARD -- cgit v1.2.3 From 55390f2a7b5657a6441b98526b80e5ebb785510e Mon Sep 17 00:00:00 2001 From: nbd Date: Sun, 27 Aug 2006 13:08:53 +0000 Subject: fix LINUX_RELEASE and use it for the kmod-* build git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4687 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/kernel.mk b/include/kernel.mk index c788bf1c4..bd558ceec 100644 --- a/include/kernel.mk +++ b/include/kernel.mk @@ -16,7 +16,7 @@ else # check to see if .kernel.mk matches target.mk ifeq ($(CONFIG_BOARD)-$(CONFIG_KERNEL),$(BOARD)-$(KERNEL)) LINUX_VERSION:=$(CONFIG_LINUX_VERSION) - RELEASE:=$(CONFIG_RELEASE) + LINUX_RELEASE:=$(CONFIG_LINUX_RELEASE) else # oops, old .kernel.config; rebuild it (hiding the misleading errors this produces) $(warning rebuilding .kernel.mk) -- cgit v1.2.3 From d07861c87d0e6a6105e042dbe8744f41466e8466 Mon Sep 17 00:00:00 2001 From: nbd Date: Sun, 27 Aug 2006 13:22:42 +0000 Subject: move $(MAKE) packages from .linux-compile: to compile: git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4689 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-build.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 5e4534281..c5b366848 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -82,7 +82,6 @@ $(LINUX_DIR)/.linux-compile: @rm -f $(BUILD_DIR)/linux ln -sf $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) $(BUILD_DIR)/linux @$(MAKE) modules - @$(MAKE) packages touch $@ $(KERNEL_IPKG): @@ -110,6 +109,7 @@ prepare: $(LINUX_DIR)/.configured @mkdir -p $(LINUX_DIR) $(PACKAGE_DIR) compile: prepare $(LINUX_DIR)/.linux-compile + @$(MAKE) packages install: compile $(LINUX_KERNEL) -- cgit v1.2.3 From 91637acf54cc52ec9c03cbd195af08e9ae8e0739 Mon Sep 17 00:00:00 2001 From: mbm Date: Wed, 30 Aug 2006 09:57:57 +0000 Subject: Add new warning to help track down pesky compile issues git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4713 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/package.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/package.mk b/include/package.mk index 332833272..311ec35a9 100644 --- a/include/package.mk +++ b/include/package.mk @@ -27,7 +27,9 @@ define Build/DefaultTargets endif ifneq ($(MAKECMDGOALS),prereq) - $$(info Rebuilding $$(_INFO)) + ifneq ($$(_INFO),) + $$(info Rebuilding $$(_INFO)) + endif endif endif endif @@ -129,6 +131,10 @@ define BuildPackage ifneq ($(CONFIG_PACKAGE_$(1)),) compile-targets: $$(IPKG_$(1)) + else + compile-targets: $(1)-disabled + $(1)-disabled: + @echo "WARNING: skipping $(1) -- package not selected" endif endif -- cgit v1.2.3 From eac6330602f08ef254803e17c7bde2ed22f5c7b8 Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 30 Aug 2006 10:24:11 +0000 Subject: only run trap error code in the configure template, if the configure script was not found git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4715 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/package.mk b/include/package.mk index 311ec35a9..ce3c4b6a1 100644 --- a/include/package.mk +++ b/include/package.mk @@ -263,7 +263,7 @@ endef define Build/Configure/Default @(cd $(PKG_BUILD_DIR)/$(3); \ - [ -x configure ] && \ + [ -x configure ] && { \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS)" \ CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ @@ -287,7 +287,7 @@ define Build/Configure/Default --infodir=/usr/info \ $(DISABLE_NLS) \ $(1); \ - true; \ + } || true; \ ) endef -- cgit v1.2.3 From c9b650c269c7dcc5383b4b614ccfe80fbaf6576c Mon Sep 17 00:00:00 2001 From: mbm Date: Wed, 30 Aug 2006 10:26:30 +0000 Subject: fix previous commit git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4716 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/package.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/package.mk b/include/package.mk index ce3c4b6a1..8d9050930 100644 --- a/include/package.mk +++ b/include/package.mk @@ -237,7 +237,7 @@ define BuildPackage clean: $(1)-clean $(PKG_BUILD_DIR)/.version-$(1)_$(VERSION)_$(PKGARCH): $(PKG_BUILD_DIR)/.prepared - -rm $(PKG_BUILD_DIR)/.version-$(1)_* + -@rm $(PKG_BUILD_DIR)/.version-$(1)_* 2>/dev/null @touch $$@ $$(eval $$(call Build/DefaultTargets,$(1))) @@ -263,7 +263,7 @@ endef define Build/Configure/Default @(cd $(PKG_BUILD_DIR)/$(3); \ - [ -x configure ] && { \ + [ \! -x configure ] || \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS)" \ CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ @@ -287,7 +287,6 @@ define Build/Configure/Default --infodir=/usr/info \ $(DISABLE_NLS) \ $(1); \ - } || true; \ ) endef -- cgit v1.2.3 From 21842638d0b7851f376ae51b08904d2b1a48d6ca Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 30 Aug 2006 10:30:14 +0000 Subject: use an if block on the whole configure command git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4717 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/package.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/package.mk b/include/package.mk index 8d9050930..9a947f358 100644 --- a/include/package.mk +++ b/include/package.mk @@ -263,7 +263,7 @@ endef define Build/Configure/Default @(cd $(PKG_BUILD_DIR)/$(3); \ - [ \! -x configure ] || \ + if [ -x configure ]; then \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS)" \ CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ @@ -287,6 +287,7 @@ define Build/Configure/Default --infodir=/usr/info \ $(DISABLE_NLS) \ $(1); \ + fi; \ ) endef -- cgit v1.2.3 From ff603530b7a12875b609bcbb25b547a102f167ad Mon Sep 17 00:00:00 2001 From: mbm Date: Thu, 7 Sep 2006 07:57:17 +0000 Subject: Clean up prereq error messages git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4766 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/prereq-build.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'include') diff --git a/include/prereq-build.mk b/include/prereq-build.mk index e90c3157b..11403c2fd 100644 --- a/include/prereq-build.mk +++ b/include/prereq-build.mk @@ -12,7 +12,7 @@ define Require/non-root [ "$$(shell whoami)" != "root" ] endef $(eval $(call Require,non-root, \ - Building OpenWrt as root is not supported! \ + Please do not compile as root. \ )) # Required for the toolchain @@ -25,7 +25,7 @@ define Require/working-make endef $(eval $(call Require,working-make, \ - Your make version is buggy. Please install GNU make v3.81 or later. \ + Please install GNU make v3.81 or later. (This version has bugs) \ )) define Require/working-gcc @@ -34,7 +34,7 @@ define Require/working-gcc endef $(eval $(call Require,working-gcc, \ - No working GNU C Compiler (gcc) was found on your system. \ + Please install the GNU C Compiler (gcc). \ )) define Require/working-g++ @@ -43,7 +43,7 @@ define Require/working-g++ endef $(eval $(call Require,working-g++, \ - No working GNU C++ Compiler (g++) was found on your system. \ + Please install the GNU C++ Compiler (g++). \ )) define Require/ncurses @@ -52,7 +52,7 @@ define Require/ncurses endef $(eval $(call Require,ncurses, \ - No ncurses development files were not found on your system. \ + Please install ncurses. (Missing libncurses.so or ncurses.h) \ )) @@ -62,7 +62,7 @@ define Require/zlib endef $(eval $(call Require,zlib, \ - No zlib development files were not found on your system. \ + Please install zlib. (Missing libz.so or zlib.h) \ )) -- cgit v1.2.3 From 57127d8916fee08e09cc95256eaf5f53d4b1ba2b Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 7 Sep 2006 12:14:08 +0000 Subject: fix unnecessary rebuilds for library package directories with no selected packages git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4767 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/package.mk | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) (limited to 'include') diff --git a/include/package.mk b/include/package.mk index 9a947f358..515698d69 100644 --- a/include/package.mk +++ b/include/package.mk @@ -17,20 +17,10 @@ define Build/DefaultTargets ifeq ($(CONFIG_AUTOREBUILD),y) _INFO:= ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) .),$(PKG_BUILD_DIR)) - _INFO+=$(subst $(TOPDIR)/,,$(PKG_BUILD_DIR)) + _INFO+=$(subst $(TOPDIR)/,,$(PKG_BUILD_DIR)) $(PKG_BUILD_DIR)/.prepared: package-clean endif - ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg -x ipkg-install $(IPKG_$(1)) $(PKG_BUILD_DIR)),$(IPKG_$(1))) - _INFO+=$(subst $(TOPDIR)/,,$(IPKG_$(1))) - $(PKG_BUILD_DIR)/.built: package-rebuild - endif - - ifneq ($(MAKECMDGOALS),prereq) - ifneq ($$(_INFO),) - $$(info Rebuilding $$(_INFO)) - endif - endif endif endif @@ -241,6 +231,19 @@ define BuildPackage @touch $$@ $$(eval $$(call Build/DefaultTargets,$(1))) + + ifneq ($$(CONFIG_PACKAGE_$(1)),) + ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg -x ipkg-install $$(IPKG_$(1)) $(PKG_BUILD_DIR)),$$(IPKG_$(1))) + _INFO+=$(subst $(TOPDIR)/,,$$(IPKG_$(1))) + $(PKG_BUILD_DIR)/.built: package-rebuild + endif + + ifneq ($(MAKECMDGOALS),prereq) + ifneq ($$(_INFO),) + $$(info Rebuilding $$(_INFO)) + endif + endif + endif endef ifneq ($(strip $(PKG_CAT)),) -- cgit v1.2.3 From de399b7bdfd5bf4756bd98c156506d11cbb01714 Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 7 Sep 2006 12:48:22 +0000 Subject: add extra rebuild check for development libraries git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4770 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/package.mk | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'include') diff --git a/include/package.mk b/include/package.mk index 515698d69..42ffcfbb3 100644 --- a/include/package.mk +++ b/include/package.mk @@ -39,6 +39,10 @@ define Build/DefaultTargets touch $$@ ifdef Build/InstallDev + ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg -x ipkg-install $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed $(PKG_BUILD_DIR)),$(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed) + $(PKG_BUILD_DIR)/.built: package-rebuild + endif + $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/stampfiles $(call Build/InstallDev) -- cgit v1.2.3 From 82453564bc58c7e9be8c0a5e9d64ec1ad7297d8c Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 7 Sep 2006 16:48:03 +0000 Subject: don't run rebuild checks for dump and prereq git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4771 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/package.mk | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'include') diff --git a/include/package.mk b/include/package.mk index 42ffcfbb3..bea042812 100644 --- a/include/package.mk +++ b/include/package.mk @@ -237,14 +237,16 @@ define BuildPackage $$(eval $$(call Build/DefaultTargets,$(1))) ifneq ($$(CONFIG_PACKAGE_$(1)),) - ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg -x ipkg-install $$(IPKG_$(1)) $(PKG_BUILD_DIR)),$$(IPKG_$(1))) - _INFO+=$(subst $(TOPDIR)/,,$$(IPKG_$(1))) - $(PKG_BUILD_DIR)/.built: package-rebuild - endif - ifneq ($(MAKECMDGOALS),prereq) - ifneq ($$(_INFO),) - $$(info Rebuilding $$(_INFO)) + ifneq ($(DUMP),1) + ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg -x ipkg-install $$(IPKG_$(1)) $(PKG_BUILD_DIR)),$$(IPKG_$(1))) + _INFO+=$(subst $(TOPDIR)/,,$$(IPKG_$(1))) + $(PKG_BUILD_DIR)/.built: package-rebuild + endif + + ifneq ($$(_INFO),) + $$(info Rebuilding $$(_INFO)) + endif endif endif endif -- cgit v1.2.3 From 722a23d418f716ce4b9d554add3143c6c81e1548 Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 7 Sep 2006 16:50:27 +0000 Subject: add quotes to ipkg name in the rebuild check git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4772 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/package.mk b/include/package.mk index bea042812..ef1fc48ec 100644 --- a/include/package.mk +++ b/include/package.mk @@ -239,7 +239,7 @@ define BuildPackage ifneq ($$(CONFIG_PACKAGE_$(1)),) ifneq ($(MAKECMDGOALS),prereq) ifneq ($(DUMP),1) - ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg -x ipkg-install $$(IPKG_$(1)) $(PKG_BUILD_DIR)),$$(IPKG_$(1))) + ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg -x ipkg-install '$$(IPKG_$(1))' '$(PKG_BUILD_DIR)'),$$(IPKG_$(1))) _INFO+=$(subst $(TOPDIR)/,,$$(IPKG_$(1))) $(PKG_BUILD_DIR)/.built: package-rebuild endif -- cgit v1.2.3 From 3399aaf35ee37df541d40aeb3a360e82341de44f Mon Sep 17 00:00:00 2001 From: mbm Date: Mon, 18 Sep 2006 21:56:07 +0000 Subject: correct arguments to Build/Prepare/Default git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4802 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/package.mk b/include/package.mk index ef1fc48ec..396fae60f 100644 --- a/include/package.mk +++ b/include/package.mk @@ -267,7 +267,7 @@ ifneq ($(strip $(PKG_CAT)),) endif define Build/Prepare - $(call Build/Prepare/Default) + $(call Build/Prepare/Default,) endef define Build/Configure/Default -- cgit v1.2.3 From aafb639ffe5e68e42244b36361fbc2434ea1ce27 Mon Sep 17 00:00:00 2001 From: nico Date: Sun, 24 Sep 2006 02:09:45 +0000 Subject: add CXXFLAGS and PKG_CONFIG_PATH in Build/Configure/Default, add EXTRA_LDFLAGS in Build/Compile/Default, use consistent search order for includes in CFLAGS. git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4849 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/package.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/package.mk b/include/package.mk index 396fae60f..f7dbacc41 100644 --- a/include/package.mk +++ b/include/package.mk @@ -271,12 +271,14 @@ define Build/Prepare endef define Build/Configure/Default - @(cd $(PKG_BUILD_DIR)/$(3); \ + (cd $(PKG_BUILD_DIR)/$(3); \ if [ -x configure ]; then \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS)" \ + CXXFLAGS="$(TARGET_CFLAGS)" \ CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ + PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \ $(2) \ ./configure \ --target=$(GNU_TARGET_NAME) \ @@ -308,7 +310,8 @@ define Build/Compile/Default $(MAKE) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ CROSS="$(TARGET_CROSS)" \ - EXTRA_CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include" \ + EXTRA_CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include " \ + EXTRA_LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib " \ ARCH="$(ARCH)" \ $(1); endef -- cgit v1.2.3 From 8cca288aa5c21e2595c0508c76680e44faa22722 Mon Sep 17 00:00:00 2001 From: nico Date: Sun, 24 Sep 2006 02:14:47 +0000 Subject: add BOARD and KERNEL to tgz image file name git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4850 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/image.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/image.mk b/include/image.mk index 903c27ba6..065167918 100644 --- a/include/image.mk +++ b/include/image.mk @@ -41,7 +41,7 @@ ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) ifeq ($(CONFIG_TARGET_ROOTFS_TGZ),y) define Image/mkfs/tgz - tar -zcf $(BIN_DIR)/openwrt-rootfs.tgz --owner=root --group=root -C $(BUILD_DIR)/root/ . + tar -zcf $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-rootfs.tgz --owner=root --group=root -C $(BUILD_DIR)/root/ . endef endif -- cgit v1.2.3 From 1d072248383ae47bd68032d69bd86cc060796ef4 Mon Sep 17 00:00:00 2001 From: nbd Date: Sun, 24 Sep 2006 13:46:10 +0000 Subject: clean up and really fix bogus build_ directory git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4854 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/prereq-build.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/prereq-build.mk b/include/prereq-build.mk index 11403c2fd..a2e5469fa 100644 --- a/include/prereq-build.mk +++ b/include/prereq-build.mk @@ -6,6 +6,7 @@ # include $(TOPDIR)/rules.mk +TMP_DIR:=$(TOPDIR)/tmp include $(INCLUDE_DIR)/prereq.mk define Require/non-root -- cgit v1.2.3 From ba4845f765e7dd3db0f7bc2aa87ebed4db051cee Mon Sep 17 00:00:00 2001 From: nico Date: Sun, 24 Sep 2006 21:17:17 +0000 Subject: fix DESCRIPTION use in menuconfig and ipkg control files git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4856 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/package.mk | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'include') diff --git a/include/package.mk b/include/package.mk index f7dbacc41..709bb4415 100644 --- a/include/package.mk +++ b/include/package.mk @@ -90,6 +90,14 @@ define Package/Default DESCRIPTION:= endef +define BuildDescription + ifneq ($(DESCRIPTION),) + DESCRIPTION:=$(TITLE)\\ $(DESCRIPTION) + else + DESCRIPTION:=$(TITLE) + endif +endef + define BuildIPKGVariable pkg_$(subst .,_,$(subst -,_,$(1)))_$(2) = $$(Package/$(1)/$(2)) export pkg_$(subst .,_,$(subst -,_,$(1))_$(2)) @@ -99,21 +107,14 @@ endef define BuildPackage $(eval $(call Package/Default)) $(eval $(call Package/$(1))) + $(eval $(call BuildDescription)) - $(foreach FIELD, TITLE CATEGORY PRIORITY VERSION, + $(foreach FIELD, TITLE CATEGORY PRIORITY SECTION VERSION, ifeq ($($(FIELD)),) $$(error Package/$(1) is missing the $(FIELD) field) endif ) - ifeq ($(PKGARCH),) - PKGARCH:=$(ARCH) - endif - - ifeq ($(DESCRIPTION),) - $(eval DESCRIPTION:=$(TITLE)) - endif - IPKG_$(1):=$(PACKAGE_DIR)/$(1)_$(VERSION)_$(PKGARCH).ipk IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg/$(1) INFO_$(1):=$(IPKG_STATE_DIR)/info/$(1).list @@ -206,7 +207,7 @@ define BuildPackage echo "Priority: $(PRIORITY)" >> $$(IDIR_$(1))/CONTROL/control echo "Maintainer: $(MAINTAINER)" >> $$(IDIR_$(1))/CONTROL/control echo "Architecture: $(PKGARCH)" >> $$(IDIR_$(1))/CONTROL/control - echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n ,g' >> $$(IDIR_$(1))/CONTROL/control + echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n,g' | sed -e 's,^[[:space:]]*$$$$, .,g' >> $$(IDIR_$(1))/CONTROL/control chmod 644 $$(IDIR_$(1))/CONTROL/control (cd $$(IDIR_$(1))/CONTROL; \ $($(1)_COMMANDS) \ -- cgit v1.2.3 From 597f84978ebcf53f2a8bf7b02d84a080025cb329 Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 27 Sep 2006 12:04:54 +0000 Subject: use 'false' instead of '/bin/false' git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4862 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/verbose.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/verbose.mk b/include/verbose.mk index 36002aee9..34568a31f 100644 --- a/include/verbose.mk +++ b/include/verbose.mk @@ -36,7 +36,7 @@ ifneq ($(KBUILD_VERBOSE),99) ifeq ($(KBUILD_VERBOSE),0) MAKE:=&>/dev/null $(MAKE) endif - MAKE:=cmd() { $(MAKE) $$* || { echo "Build failed. Please re-run make with V=99 to see what's going on"; /bin/false; } } 3>&1 4>&2; cmd + MAKE:=cmd() { $(MAKE) $$* || { echo "Build failed. Please re-run make with V=99 to see what's going on"; false; } } 3>&1 4>&2; cmd endif .SILENT: $(MAKECMDGOALS) -- cgit v1.2.3 From 652d9073459fce55104f0db8f64fc5b9100c979d Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 27 Sep 2006 17:03:36 +0000 Subject: add portability fixes for toolchain/tools (full tools/toolchain build works on osx now) git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4867 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/host-build.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/host-build.mk b/include/host-build.mk index 9a5a41317..c19cb8fd1 100644 --- a/include/host-build.mk +++ b/include/host-build.mk @@ -4,6 +4,7 @@ # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # +OS:=$(shell uname) ifneq ($(strip $(PKG_CAT)),) ifeq ($(PKG_CAT),unzip) UNPACK=unzip -d $(PKG_BUILD_DIR) $(DL_DIR)/$(PKG_SOURCE) -- cgit v1.2.3 From cf807efd13ca47672871d0c50d23274fe34c3114 Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 5 Oct 2006 12:39:52 +0000 Subject: speed up package prereq check (only run make on those directories that actually contain prereq checks) git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4927 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/package.mk | 3 ++- include/prereq.mk | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/package.mk b/include/package.mk index 709bb4415..3f2f7d41b 100644 --- a/include/package.mk +++ b/include/package.mk @@ -163,13 +163,14 @@ define BuildPackage endif DUMPINFO += \ + if [ "$$$$PREREQ_CHECK" = 1 ]; then echo "Prereq-Check: 1"; fi; \ echo "Version: $(VERSION)"; \ echo "Depends: $$(IDEPEND_$(1))"; \ echo "Build-Depends: $(PKG_BUILDDEP)"; \ echo "Category: $(CATEGORY)"; \ echo "Title: $(TITLE)"; \ echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n,g'; - + ifneq ($(URL),) DUMPINFO += \ echo; \ diff --git a/include/prereq.mk b/include/prereq.mk index c9b82d294..eda7ca35a 100644 --- a/include/prereq.mk +++ b/include/prereq.mk @@ -22,6 +22,7 @@ prereq: .SILENT: $(TMP_DIR) prereq define Require + export PREREQ_CHECK=1 ifeq ($$(CHECK_$(1)),) prereq: prereq-$(1) -- cgit v1.2.3 From 0531c4961b7217ff236c22d29744112d133327f0 Mon Sep 17 00:00:00 2001 From: nbd Date: Fri, 6 Oct 2006 17:32:22 +0000 Subject: port kmod-sched to new kernel packaging system git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4933 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/modules-2.4.mk | 4 ---- include/modules-2.6.mk | 4 ---- 2 files changed, 8 deletions(-) (limited to 'include') diff --git a/include/modules-2.4.mk b/include/modules-2.4.mk index 7ef332363..419a28bb6 100644 --- a/include/modules-2.4.mk +++ b/include/modules-2.4.mk @@ -21,10 +21,6 @@ $(eval $(call KMOD_template,IPIP,ipip,\ $(MODULES_DIR)/kernel/net/ipv4/ipip.o \ ,CONFIG_NET_IPIP,,60,ipip)) -$(eval $(call KMOD_template,SCHED,sched,\ - $(MODULES_DIR)/kernel/net/sched/*.o \ -)) - $(eval $(call KMOD_template,TUN,tun,\ $(MODULES_DIR)/kernel/drivers/net/tun.o \ ,CONFIG_TUN,,20,tun)) diff --git a/include/modules-2.6.mk b/include/modules-2.6.mk index 08ac4da81..950ff5678 100644 --- a/include/modules-2.6.mk +++ b/include/modules-2.6.mk @@ -19,10 +19,6 @@ $(eval $(call KMOD_template,IPIP,ipip,\ $(MODULES_DIR)/kernel/net/ipv4/ipip.ko \ ,CONFIG_NET_IPIP,,60,ipip)) -$(eval $(call KMOD_template,SCHED,sched,\ - $(MODULES_DIR)/kernel/net/sched/*.ko \ -,CONFIG_NET_SCHED)) - # Block devices $(eval $(call KMOD_template,LOOP,loop,\ -- cgit v1.2.3 From 064e3c52d6cd8656a07e2a286910e6e9cd876d55 Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 7 Oct 2006 18:18:01 +0000 Subject: remove x86-2.4 git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4952 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/target.mk | 1 - 1 file changed, 1 deletion(-) (limited to 'include') diff --git a/include/target.mk b/include/target.mk index 449def932..6c21f517b 100644 --- a/include/target.mk +++ b/include/target.mk @@ -13,7 +13,6 @@ endef $(eval $(call kernel_template,2.4,brcm,2_4_BRCM)) $(eval $(call kernel_template,2.4,ar7,2_4_AR7)) -$(eval $(call kernel_template,2.4,x86,2_4_X86)) $(eval $(call kernel_template,2.6,brcm,2_6_BRCM)) $(eval $(call kernel_template,2.6,brcm63xx,2_6_BRCM63XX)) $(eval $(call kernel_template,2.6,rb532,2_6_RB532)) -- cgit v1.2.3 From 60c107b531e09536b4f5b728a0e394da0720d0ba Mon Sep 17 00:00:00 2001 From: nbd Date: Sun, 8 Oct 2006 02:35:10 +0000 Subject: fix unnecessary package rebuild git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4954 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/package.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'include') diff --git a/include/package.mk b/include/package.mk index 3f2f7d41b..069e28b84 100644 --- a/include/package.mk +++ b/include/package.mk @@ -16,11 +16,10 @@ define Build/DefaultTargets ifeq ($(DUMP),) ifeq ($(CONFIG_AUTOREBUILD),y) _INFO:= - ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) .),$(PKG_BUILD_DIR)) + ifneq ($(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) .),$(PKG_BUILD_DIR)) _INFO+=$(subst $(TOPDIR)/,,$(PKG_BUILD_DIR)) $(PKG_BUILD_DIR)/.prepared: package-clean endif - endif endif -- cgit v1.2.3 From f4968ec7de4e867c0996c1f8a612f5b16bd6bdcf Mon Sep 17 00:00:00 2001 From: florian Date: Mon, 9 Oct 2006 17:18:30 +0000 Subject: Port kmod-ipip to the new module layout git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4991 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/modules-2.6.mk | 4 ---- 1 file changed, 4 deletions(-) (limited to 'include') diff --git a/include/modules-2.6.mk b/include/modules-2.6.mk index 950ff5678..fecaaba60 100644 --- a/include/modules-2.6.mk +++ b/include/modules-2.6.mk @@ -15,10 +15,6 @@ $(eval $(call KMOD_template,ATM,atm,\ $(MODULES_DIR)/kernel/drivers/atm/atmtcp.ko \ ,CONFIG_ATM,,50,atm)) -$(eval $(call KMOD_template,IPIP,ipip,\ - $(MODULES_DIR)/kernel/net/ipv4/ipip.ko \ -,CONFIG_NET_IPIP,,60,ipip)) - # Block devices $(eval $(call KMOD_template,LOOP,loop,\ -- cgit v1.2.3 From 524925e2bd98f2cd8ba4d0af3ae7333f861ed514 Mon Sep 17 00:00:00 2001 From: nico Date: Mon, 9 Oct 2006 21:06:40 +0000 Subject: Remove old kmod packaging entries moved to the new layout (follow [4992] and [4993]) git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@5006 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/modules-2.4.mk | 25 ------------------------- include/modules-2.6.mk | 8 -------- 2 files changed, 33 deletions(-) (limited to 'include') diff --git a/include/modules-2.4.mk b/include/modules-2.4.mk index 419a28bb6..e8c67ac10 100644 --- a/include/modules-2.4.mk +++ b/include/modules-2.4.mk @@ -13,18 +13,6 @@ $(eval $(call KMOD_template,ATM,atm,\ $(MODULES_DIR)/kernel/net/atm/br2684.o \ ,CONFIG_ATM,,50,atm)) -$(eval $(call KMOD_template,GRE,gre,\ - $(MODULES_DIR)/kernel/net/ipv4/ip_gre.o \ -,CONFIG_NET_IPGRE)) - -$(eval $(call KMOD_template,IPIP,ipip,\ - $(MODULES_DIR)/kernel/net/ipv4/ipip.o \ -,CONFIG_NET_IPIP,,60,ipip)) - -$(eval $(call KMOD_template,TUN,tun,\ - $(MODULES_DIR)/kernel/drivers/net/tun.o \ -,CONFIG_TUN,,20,tun)) - # Block devices $(eval $(call KMOD_template,LOOP,loop,\ @@ -92,23 +80,10 @@ $(eval $(call KMOD_template,VIDEODEV,videodev,\ # Network devices -$(eval $(call KMOD_template,NET_3C59X,net-3c59x,\ - $(MODULES_DIR)/kernel/drivers/net/3c59x.o \ -,CONFIG_VORTEX,,10,3c59x)) - -$(eval $(call KMOD_template,NET_8139TOO,net-8139too,\ - $(MODULES_DIR)/kernel/drivers/net/8139too.o \ - $(MODULES_DIR)/kernel/drivers/net/mii.o \ -,CONFIG_8139TOO,,10,mii 8139too)) - $(eval $(call KMOD_template,NET_AIRO,net-airo,\ $(MODULES_DIR)/kernel/drivers/net/wireless/airo.o \ ,CONFIG_AIRO,,10,airo)) -$(eval $(call KMOD_template,NET_E100,net-e100,\ - $(MODULES_DIR)/kernel/drivers/net/e100.o \ -,CONFIG_E100,,10,e100)) - $(eval $(call KMOD_template,NET_HERMES,net-hermes,\ $(MODULES_DIR)/kernel/drivers/net/wireless/hermes.o \ $(MODULES_DIR)/kernel/drivers/net/wireless/orinoco.o \ diff --git a/include/modules-2.6.mk b/include/modules-2.6.mk index fecaaba60..9bb08261e 100644 --- a/include/modules-2.6.mk +++ b/include/modules-2.6.mk @@ -110,18 +110,10 @@ $(eval $(call KMOD_template,NLS_UTF8,nls-utf8,\ # Network devices -$(eval $(call KMOD_template,NET_3C59X,net-3c59x,\ - $(MODULES_DIR)/kernel/drivers/net/3c59x.ko \ -,CONFIG_VORTEX,,10,3c59x)) - $(eval $(call KMOD_template,NET_AIRO,net-airo,\ $(MODULES_DIR)/kernel/drivers/net/wireless/airo.ko \ ,CONFIG_AIRO,,10,airo)) -$(eval $(call KMOD_template,NET_E100,net-e100,\ - $(MODULES_DIR)/kernel/drivers/net/e100.ko \ -,CONFIG_E100,,10,e100)) - $(eval $(call KMOD_template,NET_HERMES,net-hermes,\ $(MODULES_DIR)/kernel/drivers/net/wireless/hermes.ko \ $(MODULES_DIR)/kernel/drivers/net/wireless/orinoco.ko \ -- cgit v1.2.3 From b8885f1f93a2d6cf32afdf2e59f87a837a0d4de7 Mon Sep 17 00:00:00 2001 From: nbd Date: Tue, 10 Oct 2006 13:25:18 +0000 Subject: move certain host related variables to .host.mk generated by include/host-build.mk to speed up the build system git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@5012 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/host-build.mk | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/host-build.mk b/include/host-build.mk index c19cb8fd1..5670b6f17 100644 --- a/include/host-build.mk +++ b/include/host-build.mk @@ -4,7 +4,26 @@ # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -OS:=$(shell uname) + +include $(TOPDIR)/.host.mk + +$(TOPDIR)/.host.mk: $(INCLUDE_DIR)/host-build.mk + echo "HOST_OS:=`uname`" > $@ + echo "HOST_ARCH:=` \ + $(HOSTCC) -dumpmachine | sed -e s'/-.*//' \ + -e 's/sparc.*/sparc/' \ + -e 's/arm.*/arm/' \ + -e 's/m68k.*/m68k/' \ + -e 's/ppc/powerpc/' \ + -e 's/v850.*/v850/' \ + -e 's/sh[234]/sh/' \ + -e 's/mips-.*/mips/' \ + -e 's/mipsel-.*/mipsel/' \ + -e 's/cris.*/cris/' \ + -e 's/i[3-9]86/i386/'`" >> $@ + echo "GNU_HOST_NAME:=`$(HOSTCC) -dumpmachine`" >> $@ + + ifneq ($(strip $(PKG_CAT)),) ifeq ($(PKG_CAT),unzip) UNPACK=unzip -d $(PKG_BUILD_DIR) $(DL_DIR)/$(PKG_SOURCE) -- cgit v1.2.3 From bd97e26b6af3a3e3571b0e7164ab46380b8a03e6 Mon Sep 17 00:00:00 2001 From: nbd Date: Tue, 10 Oct 2006 13:41:00 +0000 Subject: put LINUX_KARCH in .kernel.mk git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@5013 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-build.mk | 10 ++++++++++ include/kernel.mk | 9 +-------- include/package.mk | 2 +- 3 files changed, 12 insertions(+), 9 deletions(-) (limited to 'include') diff --git a/include/kernel-build.mk b/include/kernel-build.mk index c5b366848..6aefe0b89 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -17,6 +17,15 @@ KERNEL_IPKG:=$(KERNEL_BUILD_DIR)/kernel_$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEAS TARGETS += $(KERNEL_IPKG) INSTALL_TARGETS += $(KERNEL_IPKG) +LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \ + -e 's/mipsel/mips/' \ + -e 's/mipseb/mips/' \ + -e 's/powerpc/ppc/' \ + -e 's/sh[234]/sh/' \ + -e 's/armeb/arm/' \ +) + + $(TARGETS): $(PACKAGE_DIR) $(PACKAGE_DIR): @@ -98,6 +107,7 @@ $(TOPDIR)/.kernel.mk: $(TOPDIR)/target/linux/$(BOARD)-$(KERNEL)/Makefile echo "CONFIG_KERNEL:=$(KERNEL)" >> $@ echo "CONFIG_LINUX_VERSION:=$(LINUX_VERSION)" >> $@ echo "CONFIG_LINUX_RELEASE:=$(LINUX_RELEASE)" >> $@ + echo "CONFIG_LINUX_KARCH:=$(LINUX_KARCH)" >> $@ pkg-install: FORCE @for pkg in $(INSTALL_TARGETS); do \ diff --git a/include/kernel.mk b/include/kernel.mk index bd558ceec..580e3951d 100644 --- a/include/kernel.mk +++ b/include/kernel.mk @@ -17,6 +17,7 @@ else ifeq ($(CONFIG_BOARD)-$(CONFIG_KERNEL),$(BOARD)-$(KERNEL)) LINUX_VERSION:=$(CONFIG_LINUX_VERSION) LINUX_RELEASE:=$(CONFIG_LINUX_RELEASE) + LINUX_KARCH:=$(CONFIG_LINUX_KARCH) else # oops, old .kernel.config; rebuild it (hiding the misleading errors this produces) $(warning rebuilding .kernel.mk) @@ -30,14 +31,6 @@ else LINUX_KMOD_SUFFIX=o endif - LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \ - -e 's/mipsel/mips/' \ - -e 's/mipseb/mips/' \ - -e 's/powerpc/ppc/' \ - -e 's/sh[234]/sh/' \ - -e 's/armeb/arm/' \ - ) - KERNELNAME= ifneq (,$(findstring x86,$(BOARD))) KERNELNAME="bzImage" diff --git a/include/package.mk b/include/package.mk index 069e28b84..e93192413 100644 --- a/include/package.mk +++ b/include/package.mk @@ -16,7 +16,7 @@ define Build/DefaultTargets ifeq ($(DUMP),) ifeq ($(CONFIG_AUTOREBUILD),y) _INFO:= - ifneq ($(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) .),$(PKG_BUILD_DIR)) + ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) .),$(PKG_BUILD_DIR)) _INFO+=$(subst $(TOPDIR)/,,$(PKG_BUILD_DIR)) $(PKG_BUILD_DIR)/.prepared: package-clean endif -- cgit v1.2.3 From 34dbf787c3fa13541abc9aadcf53c23016895382 Mon Sep 17 00:00:00 2001 From: nbd Date: Tue, 10 Oct 2006 15:30:50 +0000 Subject: add support for a common shell include file, which is evaluated for every make shell call, simplify variable passing to the shell with shvar and shexport templates, use Package//config for adding config.in data git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@5014 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/package.mk | 38 +++++++++++++++++++++++--------------- include/shell.sh | 15 +++++++++++++++ 2 files changed, 38 insertions(+), 15 deletions(-) create mode 100644 include/shell.sh (limited to 'include') diff --git a/include/package.mk b/include/package.mk index e93192413..181ea32b6 100644 --- a/include/package.mk +++ b/include/package.mk @@ -12,6 +12,15 @@ endif include $(INCLUDE_DIR)/prereq.mk +define shvar +V_$(subst .,_,$(subst -,_,$(subst /,_,$(1)))) +endef + +define shexport +$(call shvar,$(1))=$$(call $(1)) +export $(call shvar,$(1)) +endef + define Build/DefaultTargets ifeq ($(DUMP),) ifeq ($(CONFIG_AUTOREBUILD),y) @@ -98,9 +107,8 @@ define BuildDescription endef define BuildIPKGVariable - pkg_$(subst .,_,$(subst -,_,$(1)))_$(2) = $$(Package/$(1)/$(2)) - export pkg_$(subst .,_,$(subst -,_,$(1))_$(2)) - $(1)_COMMANDS += if [ -n "$$$$$$$$pkg_$(subst .,_,$(subst -,_,$(1)))_$(2)" ]; then echo "$$$$$$$$pkg_$(subst .,_,$(subst -,_,$(1)))_$(2)" > $(2); fi; + $(call shexport,Package/$(1)/$(2)) + $(1)_COMMANDS += var2file "$(call shvar,Package/$(1)/$(2))" $(2); endef define BuildPackage @@ -168,22 +176,22 @@ define BuildPackage echo "Build-Depends: $(PKG_BUILDDEP)"; \ echo "Category: $(CATEGORY)"; \ echo "Title: $(TITLE)"; \ - echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n,g'; + echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n,g'; \ ifneq ($(URL),) DUMPINFO += \ - echo; \ - echo "$(URL)"; - endif - - DUMPINFO += \ - echo "@@"; - - ifneq ($(CONFIG),) - DUMPINFO += \ - echo "Config: $(CONFIG)" | sed -e 's,\\,\n,g'; \ - echo "@@"; + echo; \ + echo "$(URL)"; endif + + DUMPINFO += \ + echo "@@"; + + $(call shexport,Package/$(1)/config) + DUMPINFO += \ + if isset $(call shvar,Package/$(1)/config); then echo "Config: "; getvar $(call shvar,Package/$(1)/config); fi; \ + echo "@@"; + endif $(eval $(call BuildIPKGVariable,$(1),conffiles)) diff --git a/include/shell.sh b/include/shell.sh new file mode 100644 index 000000000..6ee0cf603 --- /dev/null +++ b/include/shell.sh @@ -0,0 +1,15 @@ +getvar() { + eval "echo \"\${$1}\"" +} + +var2file() { + local var + eval "var=\"\${$1}\"" + if [ -n "$var" ]; then echo "$var" > "$2"; fi +} + +isset() { + local var + eval "var=\"\${$1}\"" + [ -n "$var" ] +} -- cgit v1.2.3 From 9ef909243235306a47edba82e852211ff6a40853 Mon Sep 17 00:00:00 2001 From: nbd Date: Tue, 10 Oct 2006 15:45:36 +0000 Subject: add support for Package//description - old format still supported, but deprecated git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@5015 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/package.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/package.mk b/include/package.mk index 181ea32b6..7ae95f8fe 100644 --- a/include/package.mk +++ b/include/package.mk @@ -169,6 +169,8 @@ define BuildPackage echo "Default: $(DEFAULT)"; endif + $(call shexport,Package/$(1)/description) + DUMPINFO += \ if [ "$$$$PREREQ_CHECK" = 1 ]; then echo "Prereq-Check: 1"; fi; \ echo "Version: $(VERSION)"; \ @@ -176,7 +178,12 @@ define BuildPackage echo "Build-Depends: $(PKG_BUILDDEP)"; \ echo "Category: $(CATEGORY)"; \ echo "Title: $(TITLE)"; \ - echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n,g'; \ + if isset $(call shvar,Package/$(1)/description); then \ + echo -n "Description: "; \ + getvar $(call shvar,Package/$(1)/description); \ + else \ + echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n,g'; \ + fi; ifneq ($(URL),) DUMPINFO += \ -- cgit v1.2.3 From f21778d9c29b75f073c3d41208f0eaeedfbd1b1e Mon Sep 17 00:00:00 2001 From: nbd Date: Tue, 10 Oct 2006 16:58:47 +0000 Subject: move the common variables from host-build.mk to host.mk git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@5021 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/host-build.mk | 19 +------------------ include/host.mk | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 18 deletions(-) create mode 100644 include/host.mk (limited to 'include') diff --git a/include/host-build.mk b/include/host-build.mk index 5670b6f17..a1287da47 100644 --- a/include/host-build.mk +++ b/include/host-build.mk @@ -5,24 +5,7 @@ # See /LICENSE for more information. # -include $(TOPDIR)/.host.mk - -$(TOPDIR)/.host.mk: $(INCLUDE_DIR)/host-build.mk - echo "HOST_OS:=`uname`" > $@ - echo "HOST_ARCH:=` \ - $(HOSTCC) -dumpmachine | sed -e s'/-.*//' \ - -e 's/sparc.*/sparc/' \ - -e 's/arm.*/arm/' \ - -e 's/m68k.*/m68k/' \ - -e 's/ppc/powerpc/' \ - -e 's/v850.*/v850/' \ - -e 's/sh[234]/sh/' \ - -e 's/mips-.*/mips/' \ - -e 's/mipsel-.*/mipsel/' \ - -e 's/cris.*/cris/' \ - -e 's/i[3-9]86/i386/'`" >> $@ - echo "GNU_HOST_NAME:=`$(HOSTCC) -dumpmachine`" >> $@ - +include $(INCLUDE_DIR)/host.mk ifneq ($(strip $(PKG_CAT)),) ifeq ($(PKG_CAT),unzip) diff --git a/include/host.mk b/include/host.mk new file mode 100644 index 000000000..b4580e2b7 --- /dev/null +++ b/include/host.mk @@ -0,0 +1,24 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/.host.mk + +$(TOPDIR)/.host.mk: $(INCLUDE_DIR)/host.mk + echo "HOST_OS:=`uname`" > $@ + echo "HOST_ARCH:=` \ + $(HOSTCC) -dumpmachine | sed -e s'/-.*//' \ + -e 's/sparc.*/sparc/' \ + -e 's/arm.*/arm/' \ + -e 's/m68k.*/m68k/' \ + -e 's/ppc/powerpc/' \ + -e 's/v850.*/v850/' \ + -e 's/sh[234]/sh/' \ + -e 's/mips-.*/mips/' \ + -e 's/mipsel-.*/mipsel/' \ + -e 's/cris.*/cris/' \ + -e 's/i[3-9]86/i386/'`" >> $@ + echo "GNU_HOST_NAME:=`$(HOSTCC) -dumpmachine`" >> $@ -- cgit v1.2.3 From 318409fc3f68c0f6c6cdf52bb706bcba2a94e16b Mon Sep 17 00:00:00 2001 From: nbd Date: Tue, 10 Oct 2006 17:03:38 +0000 Subject: only use --wildcards for gnu tar git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@5022 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/host.mk | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'include') diff --git a/include/host.mk b/include/host.mk index b4580e2b7..645888147 100644 --- a/include/host.mk +++ b/include/host.mk @@ -22,3 +22,7 @@ $(TOPDIR)/.host.mk: $(INCLUDE_DIR)/host.mk -e 's/cris.*/cris/' \ -e 's/i[3-9]86/i386/'`" >> $@ echo "GNU_HOST_NAME:=`$(HOSTCC) -dumpmachine`" >> $@ + if tar --version 2>&1 | grep 'GNU' >/dev/null; then \ + echo "TAR_OPTIONS+=--wildcards" >> $@; \ + fi + -- cgit v1.2.3 From ba9d778c9706dc3774edcb0216ce551f057cb6e3 Mon Sep 17 00:00:00 2001 From: nbd Date: Tue, 10 Oct 2006 17:04:17 +0000 Subject: hide .host.mk commands git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@5023 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/host.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/host.mk b/include/host.mk index 645888147..93f86dce8 100644 --- a/include/host.mk +++ b/include/host.mk @@ -8,8 +8,8 @@ include $(TOPDIR)/.host.mk $(TOPDIR)/.host.mk: $(INCLUDE_DIR)/host.mk - echo "HOST_OS:=`uname`" > $@ - echo "HOST_ARCH:=` \ + @echo "HOST_OS:=`uname`" > $@ + @echo "HOST_ARCH:=` \ $(HOSTCC) -dumpmachine | sed -e s'/-.*//' \ -e 's/sparc.*/sparc/' \ -e 's/arm.*/arm/' \ @@ -21,8 +21,8 @@ $(TOPDIR)/.host.mk: $(INCLUDE_DIR)/host.mk -e 's/mipsel-.*/mipsel/' \ -e 's/cris.*/cris/' \ -e 's/i[3-9]86/i386/'`" >> $@ - echo "GNU_HOST_NAME:=`$(HOSTCC) -dumpmachine`" >> $@ - if tar --version 2>&1 | grep 'GNU' >/dev/null; then \ + @echo "GNU_HOST_NAME:=`$(HOSTCC) -dumpmachine`" >> $@ + @if tar --version 2>&1 | grep 'GNU' >/dev/null; then \ echo "TAR_OPTIONS+=--wildcards" >> $@; \ fi -- cgit v1.2.3 From 3d124095e990fd0ab21730fbc9541048643dbeb4 Mon Sep 17 00:00:00 2001 From: nbd Date: Tue, 10 Oct 2006 17:13:40 +0000 Subject: don't touch TAR_OPTIONS in host.mk git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@5024 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/host.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/host.mk b/include/host.mk index 93f86dce8..9eee20fcf 100644 --- a/include/host.mk +++ b/include/host.mk @@ -23,6 +23,6 @@ $(TOPDIR)/.host.mk: $(INCLUDE_DIR)/host.mk -e 's/i[3-9]86/i386/'`" >> $@ @echo "GNU_HOST_NAME:=`$(HOSTCC) -dumpmachine`" >> $@ @if tar --version 2>&1 | grep 'GNU' >/dev/null; then \ - echo "TAR_OPTIONS+=--wildcards" >> $@; \ + echo "TAR_WILDCARDS:=--wildcards" >> $@; \ fi -- cgit v1.2.3 From fa8f555b9dc6b1476a806acc191a58241875a7ea Mon Sep 17 00:00:00 2001 From: nbd Date: Tue, 10 Oct 2006 18:31:39 +0000 Subject: fix HOST_ARCH and GNU_HOST_NAME for freebsd and other operating systems git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@5027 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/host.mk | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) (limited to 'include') diff --git a/include/host.mk b/include/host.mk index 9eee20fcf..abcf045d0 100644 --- a/include/host.mk +++ b/include/host.mk @@ -8,21 +8,20 @@ include $(TOPDIR)/.host.mk $(TOPDIR)/.host.mk: $(INCLUDE_DIR)/host.mk - @echo "HOST_OS:=`uname`" > $@ - @echo "HOST_ARCH:=` \ - $(HOSTCC) -dumpmachine | sed -e s'/-.*//' \ - -e 's/sparc.*/sparc/' \ - -e 's/arm.*/arm/' \ - -e 's/m68k.*/m68k/' \ - -e 's/ppc/powerpc/' \ - -e 's/v850.*/v850/' \ - -e 's/sh[234]/sh/' \ - -e 's/mips-.*/mips/' \ - -e 's/mipsel-.*/mipsel/' \ - -e 's/cris.*/cris/' \ - -e 's/i[3-9]86/i386/'`" >> $@ - @echo "GNU_HOST_NAME:=`$(HOSTCC) -dumpmachine`" >> $@ - @if tar --version 2>&1 | grep 'GNU' >/dev/null; then \ - echo "TAR_WILDCARDS:=--wildcards" >> $@; \ - fi + @( \ + HOST_OS=`uname`; \ + case "$$HOST_OS" in \ + Linux) HOST_ARCH=`uname -m`;; \ + *) HOST_ARCH=`uname -p`;; \ + esac; \ + GNU_HOST_NAME=`gcc -dumpmachine`; \ + [ -n "$$GNU_HOST_NAME" ] || \ + GNU_HOST_NAME=`$(SCRIPT_DIR)/config.guess`; \ + echo "HOST_OS:=$$HOST_OS" > $@; \ + echo "HOST_ARCH:=$$HOST_ARCH" >> $@; \ + echo "GNU_HOST_NAME:=$$GNU_HOST_NAME" >> $@; \ + if tar --version 2>&1 | grep 'GNU' >/dev/null; then \ + echo "TAR_WILDCARDS:=--wildcards" >> $@; \ + fi; \ + ) -- cgit v1.2.3 From 3dcf8b9e33a39bb791904fcf6b2a4ff6ccbcfa7a Mon Sep 17 00:00:00 2001 From: nbd Date: Tue, 10 Oct 2006 21:06:45 +0000 Subject: more portability fixes and a prereq check for gnu tar git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@5037 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/host.mk | 4 ++++ include/prereq-build.mk | 9 +++++++++ 2 files changed, 13 insertions(+) (limited to 'include') diff --git a/include/host.mk b/include/host.mk index abcf045d0..3a5fd9683 100644 --- a/include/host.mk +++ b/include/host.mk @@ -7,6 +7,8 @@ include $(TOPDIR)/.host.mk +export TAR + $(TOPDIR)/.host.mk: $(INCLUDE_DIR)/host.mk @( \ HOST_OS=`uname`; \ @@ -23,5 +25,7 @@ $(TOPDIR)/.host.mk: $(INCLUDE_DIR)/host.mk if tar --version 2>&1 | grep 'GNU' >/dev/null; then \ echo "TAR_WILDCARDS:=--wildcards" >> $@; \ fi; \ + TAR=`which gtar tar | head -n 1`; \ + echo "TAR:=$$TAR" >> $@; \ ) diff --git a/include/prereq-build.mk b/include/prereq-build.mk index a2e5469fa..d6396af8e 100644 --- a/include/prereq-build.mk +++ b/include/prereq-build.mk @@ -8,6 +8,7 @@ include $(TOPDIR)/rules.mk TMP_DIR:=$(TOPDIR)/tmp include $(INCLUDE_DIR)/prereq.mk +include $(INCLUDE_DIR)/host.mk define Require/non-root [ "$$(shell whoami)" != "root" ] @@ -94,3 +95,11 @@ $(eval $(call RequireCommand,patch, \ $(eval $(call RequireCommand,perl, \ Please install perl. \ )) + +define Require/gnutar + $(TAR) --version 2>&1 | grep GNU > /dev/null +endef + +$(eval $(call Require,gnutar, \ + Please install GNU tar. \ +)) -- cgit v1.2.3 From 711eed53f9d5432ac4b486b7a75ab64a5d29654f Mon Sep 17 00:00:00 2001 From: nbd Date: Tue, 10 Oct 2006 21:22:35 +0000 Subject: don't include host.mk from rules.mk - confuses package dump git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@5038 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/package.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/package.mk b/include/package.mk index 7ae95f8fe..5a9ba861a 100644 --- a/include/package.mk +++ b/include/package.mk @@ -11,6 +11,7 @@ else endif include $(INCLUDE_DIR)/prereq.mk +include $(INCLUDE_DIR)/host.mk define shvar V_$(subst .,_,$(subst -,_,$(subst /,_,$(1)))) -- cgit v1.2.3 From d4c503111cbea9658f33e780463983bbc35d3622 Mon Sep 17 00:00:00 2001 From: nbd Date: Tue, 10 Oct 2006 23:04:46 +0000 Subject: more fixes git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@5048 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-build.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 6aefe0b89..5544a82e3 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -4,6 +4,7 @@ # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # +include $(INCLUDE_DIR)/host.mk -include $(INCLUDE_DIR)/modules-$(KERNEL).mk LINUX_SOURCE:=linux-$(LINUX_VERSION).tar.bz2 -- cgit v1.2.3