From ec5b83ce2fe8f4f387f7f87b71632830ce382901 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Wed, 3 Jan 2007 13:44:01 +0000 Subject: - add missing package-source targets - add missing dependencies to build prerequisites in the config system --- package/at/at.mk | 3 ++- package/bash/Config.in | 1 + package/cvs/Config.in | 1 + package/cvs/cvs.mk | 2 ++ package/distcc/distcc.mk | 2 ++ package/dm/dm.mk | 2 ++ package/dmraid/dmraid.mk | 2 ++ package/iproute2/iproute2.mk | 2 ++ package/libusb/libusb.mk | 2 ++ package/lvm2/lvm2.mk | 2 ++ package/nano/Config.in | 1 + package/nano/nano.mk | 2 ++ package/portmap/portmap.mk | 2 ++ package/procps/Config.in | 1 + package/psmisc/Config.in | 1 + package/rsync/rsync.mk | 2 ++ package/sqlite/Config.in | 2 ++ package/sysvinit/Config.in | 1 + package/sysvinit/sysvinit.mk | 2 ++ package/thttpd/thttpd.mk | 2 ++ package/usbutils/usbutils.mk | 2 ++ package/wget/wget.mk | 2 ++ package/which/which.mk | 2 ++ 23 files changed, 40 insertions(+), 1 deletion(-) diff --git a/package/at/at.mk b/package/at/at.mk index 9af356314..40e4debeb 100644 --- a/package/at/at.mk +++ b/package/at/at.mk @@ -13,6 +13,8 @@ AT_TARGET_BINARY:=usr/bin/at $(DL_DIR)/$(AT_SOURCE): $(WGET) -P $(DL_DIR) $(AT_SITE)/$(AT_SOURCE) +at-source: $(DL_DIR)/$(AT_SOURCE) + $(AT_DIR)/.unpacked: $(DL_DIR)/$(AT_SOURCE) $(AT_CAT) $(DL_DIR)/$(AT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - toolchain/patch-kernel.sh $(AT_DIR) package/at/ at\*.patch @@ -58,7 +60,6 @@ at-clean: at-dirclean: rm -rf $(AT_DIR) - ############################################################# # # Toplevel Makefile options diff --git a/package/bash/Config.in b/package/bash/Config.in index 8b39c21ac..858b530d8 100644 --- a/package/bash/Config.in +++ b/package/bash/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_BASH bool "bash" default n + select BR2_PACKAGE_NCURSES help The standard GNU Bourne again shell. diff --git a/package/cvs/Config.in b/package/cvs/Config.in index 21a8b618d..52cf66625 100644 --- a/package/cvs/Config.in +++ b/package/cvs/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_CVS bool "cvs" default n + select BR2_PACKAGE_NCURSES help Concurrent Versions System - source code revision control tools. diff --git a/package/cvs/cvs.mk b/package/cvs/cvs.mk index 6e9d86054..d4f9936f5 100644 --- a/package/cvs/cvs.mk +++ b/package/cvs/cvs.mk @@ -14,6 +14,8 @@ CVS_TARGET_BINARY:=usr/bin/cvs $(DL_DIR)/$(CVS_SOURCE): $(WGET) -P $(DL_DIR) $(CVS_SITE)/$(CVS_SOURCE) +cvs-source: $(DL_DIR)/$(CVS_SOURCE) + $(CVS_DIR)/.unpacked: $(DL_DIR)/$(CVS_SOURCE) $(CVS_CAT) $(DL_DIR)/$(CVS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - touch $(CVS_DIR)/.unpacked diff --git a/package/distcc/distcc.mk b/package/distcc/distcc.mk index 578c3a31c..d9a88e706 100644 --- a/package/distcc/distcc.mk +++ b/package/distcc/distcc.mk @@ -14,6 +14,8 @@ DISTCC_TARGET_BINARY:=usr/bin/distcc $(DL_DIR)/$(DISTCC_SOURCE): $(WGET) -P $(DL_DIR) $(DISTCC_SITE)/$(DISTCC_SOURCE) +distcc-source: $(DL_DIR)/$(CVS_SOURCE) + $(DISTCC_DIR)/.unpacked: $(DL_DIR)/$(DISTCC_SOURCE) $(DISTCC_CAT) $(DL_DIR)/$(DISTCC_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - touch $(DISTCC_DIR)/.unpacked diff --git a/package/dm/dm.mk b/package/dm/dm.mk index 832cd9318..33830a7bd 100644 --- a/package/dm/dm.mk +++ b/package/dm/dm.mk @@ -40,6 +40,8 @@ $(DL_DIR)/$(DM_SOURCE): $(WGET) -P $(DL_DIR) $(DM_SITE)/$(DM_SOURCE) || \ $(WGET) -P $(DL_DIR) $(DM_SITE_OLD)/$(DM_SOURCE) +dm-source: $(DL_DIR)/$(DM_SOURCE) + $(DM_DIR)/.unpacked: $(DL_DIR)/$(DM_SOURCE) $(DM_CAT) $(DL_DIR)/$(DM_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - toolchain/patch-kernel.sh $(DM_DIR) package/dm/ \*.patch diff --git a/package/dmraid/dmraid.mk b/package/dmraid/dmraid.mk index 0c151a11d..4283771ec 100644 --- a/package/dmraid/dmraid.mk +++ b/package/dmraid/dmraid.mk @@ -16,6 +16,8 @@ DMRAID_TARGET_BINARY:=$(TARGET_DIR)/sbin/$(DMRAID_BINARY) $(DL_DIR)/$(DMRAID_SOURCE): $(WGET) -P $(DL_DIR) $(DMRAID_SITE)/$(DMRAID_SOURCE) +dmraid-source: $(DL_DIR)/$(DMRAID_SOURCE) + $(DMRAID_DIR)/.unpacked: $(DL_DIR)/$(DMRAID_SOURCE) $(DMRAID_CAT) $(DL_DIR)/$(DMRAID_SOURCE) | tar -C $(BUILD_DIR) -xvf - toolchain/patch-kernel.sh $(DMRAID_DIR) package/dmraid \*.patch diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk index 703d4c84f..e8127de72 100644 --- a/package/iproute2/iproute2.mk +++ b/package/iproute2/iproute2.mk @@ -15,6 +15,8 @@ IPROUTE2_TARGET_BINARY:=sbin/tc $(DL_DIR)/$(IPROUTE2_SOURCE): $(WGET) -P $(DL_DIR) $(IPROUTE2_SITE)$(IPROUTE2_SOURCE) +iproute2-source: $(DL_DIR)/$(IPROUTE2_SOURCE) + $(IPROUTE2_DIR)/.unpacked: $(DL_DIR)/$(IPROUTE2_SOURCE) $(IPROUTE2_CAT) $(DL_DIR)/$(IPROUTE2_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - touch $(IPROUTE2_DIR)/.unpacked diff --git a/package/libusb/libusb.mk b/package/libusb/libusb.mk index 8078b9605..043a0b970 100644 --- a/package/libusb/libusb.mk +++ b/package/libusb/libusb.mk @@ -20,6 +20,8 @@ endif $(DL_DIR)/$(LIBUSB_SOURCE): $(WGET) -P $(DL_DIR) $(LIBUSB_SITE)/$(LIBUSB_SOURCE) +libusb-source: $(DL_DIR)/$(LIBUSB_SOURCE) + libusb-unpacked: $(LIBUSB_DIR)/.unpacked $(LIBUSB_DIR)/.unpacked: $(DL_DIR)/$(LIBUSB_SOURCE) $(LIBUSB_CAT) $(DL_DIR)/$(LIBUSB_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk index 2760fc7dc..7a77f4712 100644 --- a/package/lvm2/lvm2.mk +++ b/package/lvm2/lvm2.mk @@ -36,6 +36,8 @@ LVM2_TARGET_SBINS=$(foreach lvm2sbin, $(LVM2_SBIN), $(TARGET_DIR)/sbin/$(lvm2sbi $(DL_DIR)/$(LVM2_SOURCE): $(WGET) -P $(DL_DIR) $(LVM2_SITE)/$(LVM2_SOURCE) +lvm2-source: $(DL_DIR)/$(LVM2_SOURCE) + $(LVM2_DIR)/.unpacked: $(DL_DIR)/$(LVM2_SOURCE) $(LVM2_CAT) $(DL_DIR)/$(LVM2_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - touch $(LVM2_DIR)/.unpacked diff --git a/package/nano/Config.in b/package/nano/Config.in index 203279893..272c061ee 100644 --- a/package/nano/Config.in +++ b/package/nano/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_NANO bool "nano" default n + select BR2_PACKAGE_NCURSES help A nice ncurses-based editor. Started out as a clone of pico. Great editor for new users. diff --git a/package/nano/nano.mk b/package/nano/nano.mk index 148a025bb..fa0e8a811 100644 --- a/package/nano/nano.mk +++ b/package/nano/nano.mk @@ -14,6 +14,8 @@ NANO_TARGET_BINARY:=bin/nano $(DL_DIR)/$(NANO_SOURCE): $(WGET) -P $(DL_DIR) $(NANO_SITE)/$(NANO_SOURCE) +nano-source: $(DL_DIR)/$(NANO_SOURCE) + $(NANO_DIR)/.unpacked: $(DL_DIR)/$(NANO_SOURCE) $(NANO_CAT) $(DL_DIR)/$(NANO_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - touch $(NANO_DIR)/.unpacked diff --git a/package/portmap/portmap.mk b/package/portmap/portmap.mk index 5f014b8e1..001ecbb43 100644 --- a/package/portmap/portmap.mk +++ b/package/portmap/portmap.mk @@ -14,6 +14,8 @@ PORTMAP_TARGET_BINARY:=sbin/portmap $(DL_DIR)/$(PORTMAP_SOURCE): $(WGET) -P $(DL_DIR) $(PORTMAP_SITE)/$(PORTMAP_SOURCE) +portmap-source: $(DL_DIR)/$(PORTMAP_SOURCE) + $(PORTMAP_DIR)/.unpacked: $(DL_DIR)/$(PORTMAP_SOURCE) $(PORTMAP_CAT) $(DL_DIR)/$(PORTMAP_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - toolchain/patch-kernel.sh $(PORTMAP_DIR) package/portmap/ portmap\*.patch diff --git a/package/procps/Config.in b/package/procps/Config.in index 43f8ff29a..3a4cb84c8 100644 --- a/package/procps/Config.in +++ b/package/procps/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PROCPS bool "procps" default n + select BR2_PACKAGE_NCURSES help Standard informational utilities and process-handling tools. Provides things like kill, ps, uptime, free, top, etc... diff --git a/package/psmisc/Config.in b/package/psmisc/Config.in index 04fed6b9c..fa7bf143d 100644 --- a/package/psmisc/Config.in +++ b/package/psmisc/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PSMISC bool "psmisc" default n + select BR2_PACKAGE_NCURSES help Helpful /proc related utilities such as pstree, fuser, and killall diff --git a/package/rsync/rsync.mk b/package/rsync/rsync.mk index b1d3bd020..90dbfe634 100644 --- a/package/rsync/rsync.mk +++ b/package/rsync/rsync.mk @@ -14,6 +14,8 @@ RSYNC_TARGET_BINARY:=usr/bin/rsync $(DL_DIR)/$(RSYNC_SOURCE): $(WGET) -P $(DL_DIR) $(RSYNC_SITE)/$(RSYNC_SOURCE) +rsync-source: $(DL_DIR)/$(RSYNC_SOURCE) + $(RSYNC_DIR)/.unpacked: $(DL_DIR)/$(RSYNC_SOURCE) $(RSYNC_CAT) $(DL_DIR)/$(RSYNC_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - toolchain/patch-kernel.sh $(RSYNC_DIR) package/rsync/ rsync\*.patch diff --git a/package/sqlite/Config.in b/package/sqlite/Config.in index 64d942cfb..bc6dce95e 100644 --- a/package/sqlite/Config.in +++ b/package/sqlite/Config.in @@ -1,6 +1,8 @@ config BR2_PACKAGE_SQLITE bool "sqlite" default n + select BR2_PACKAGE_NCURSES + select BR2_READLINE help SQLite is a small C library that implements a self-contained, embeddable, zero-configuration SQL database engine. diff --git a/package/sysvinit/Config.in b/package/sysvinit/Config.in index fc645d4a9..1bf90a218 100644 --- a/package/sysvinit/Config.in +++ b/package/sysvinit/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_SYSVINIT bool "sysvinit" default n + select BR2_PACKAGE_NCURSES help /sbin/init - parent of all processes diff --git a/package/sysvinit/sysvinit.mk b/package/sysvinit/sysvinit.mk index af26d6463..a4ac612e0 100644 --- a/package/sysvinit/sysvinit.mk +++ b/package/sysvinit/sysvinit.mk @@ -14,6 +14,8 @@ SYSVINIT_TARGET_BINARY:=bin/init $(DL_DIR)/$(SYSVINIT_SOURCE): $(WGET) -P $(DL_DIR) $(SYSVINIT_SITE)/$(SYSVINIT_SOURCE) +sysvinit-source: $(DL_DIR)/$(SYSVINIT_SOURCE) + sysvinit-unpacked: $(SYSVINIT_DIR)/.unpacked $(SYSVINIT_DIR)/.unpacked: $(DL_DIR)/$(SYSVINIT_SOURCE) $(SYSVINIT_CAT) $(DL_DIR)/$(SYSVINIT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/thttpd/thttpd.mk b/package/thttpd/thttpd.mk index fe25bb5c0..f4db49110 100644 --- a/package/thttpd/thttpd.mk +++ b/package/thttpd/thttpd.mk @@ -16,6 +16,8 @@ THTTPD_WEB_DIR:=$(THTTPD_ROOT)/www $(DL_DIR)/$(THTTPD_SOURCE): $(WGET) -P $(DL_DIR) $(THTTPD_SITE)/$(THTTPD_SOURCE) +thttpd-source: $(DL_DIR)/$(THTTPD_SOURCE) + $(THTTPD_DIR)/.unpacked: $(DL_DIR)/$(THTTPD_SOURCE) $(THTTPD_CAT) $(DL_DIR)/$(THTTPD_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - touch $(THTTPD_DIR)/.unpacked diff --git a/package/usbutils/usbutils.mk b/package/usbutils/usbutils.mk index 93a47195e..25656fc08 100644 --- a/package/usbutils/usbutils.mk +++ b/package/usbutils/usbutils.mk @@ -14,6 +14,8 @@ USBUTILS_TARGET_BINARY:=usr/bin/lsusb $(DL_DIR)/$(USBUTILS_SOURCE): $(WGET) -P $(DL_DIR) $(USBUTILS_SITE)/$(USBUTILS_SOURCE) +usbutils-source: $(DL_DIR)/$(USBUTILS_SOURCE) + usbutils-unpacked: $(USBUTILS_DIR)/.unpacked $(USBUTILS_DIR)/.unpacked: $(DL_DIR)/$(USBUTILS_SOURCE) $(USBUTILS_CAT) $(DL_DIR)/$(USBUTILS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/wget/wget.mk b/package/wget/wget.mk index b2a26244e..c2273549a 100644 --- a/package/wget/wget.mk +++ b/package/wget/wget.mk @@ -14,6 +14,8 @@ WGET_TARGET_BINARY:=bin/wget $(DL_DIR)/$(WGET_SOURCE): $(WGET) -P $(DL_DIR) $(WGET_SITE)/$(WGET_SOURCE) +wget-source: $(DL_DIR)/$(WGET_SOURCE) + $(WGET_DIR)/.unpacked: $(DL_DIR)/$(WGET_SOURCE) $(WGET_CAT) $(DL_DIR)/$(WGET_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - touch $(WGET_DIR)/.unpacked diff --git a/package/which/which.mk b/package/which/which.mk index 992d076a1..0bec96543 100644 --- a/package/which/which.mk +++ b/package/which/which.mk @@ -14,6 +14,8 @@ WHICH_TARGET_BINARY:=bin/which $(DL_DIR)/$(WHICH_SOURCE): $(WGET) -P $(DL_DIR) $(WHICH_SITE)/$(WHICH_SOURCE) +which-source: $(DL_DIR)/$(WHICH_SOURCE) + $(WHICH_DIR)/.unpacked: $(DL_DIR)/$(WHICH_SOURCE) $(WHICH_CAT) $(DL_DIR)/$(WHICH_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - touch $(WHICH_DIR)/.unpacked -- cgit v1.2.3