gitolite/buildrootschalter
gitolite/buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Thomas Cameron writes:

Browse Source 
this patch fixes the source file downloads when executing a "make source", and
a few cut-and-paste (tm) errors in the *.mk files.  Again, this is a patch
against the current CVS sources, and includes my previous patch.
This commit is contained in:
Eric Andersen 2003-11-12 09:31:12 +00:00
parent e150f3921b
commit 0fee9e90c2
30 changed files with 71 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
make/binutils.mk
View File

@ -9,6 +9,7 @@ BINUTILS_DIR:=$(TOOL_BUILD_DIR)/binutils-2.14.90.0.6
BINUTILS_CAT:=bzcat
BINUTILS_DIR1:=$(TOOL_BUILD_DIR)/binutils-build
$(DL_DIR)/$(BINUTILS_SOURCE):
$(WGET) -P $(DL_DIR) $(BINUTILS_SITE)/$(BINUTILS_SOURCE)
@ -98,6 +99,8 @@ $(STAGING_DIR)/lib/libg.a:
binutils: $(STAGING_DIR)/$(GNU_TARGET_NAME)/bin/ld $(STAGING_DIR)/lib/libg.a
binutils-source: $(DL_DIR)/$(BINUTILS_SOURCE)
binutils-clean:
rm -f $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)*
-$(MAKE) -C $(BINUTILS_DIR1) clean
@ -198,7 +201,3 @@ binutils_target-clean:
binutils_target-dirclean:
rm -rf $(BINUTILS_DIR2)

2
make/boa.mk
View File

@ -45,6 +45,8 @@ $(BOA_WORKDIR)/.installed: $(BOA_WORKDIR)/boa $(BOA_WORKDIR)/boa_indexer
boa: uclibc $(BOA_WORKDIR)/.installed
boa-source: $(DL_DIR)/$(BOA_SOURCE)
boa-clean:
@if [ -d $(BOA_WORKDIR)/Makefile ] ; then \
$(MAKE) -C $(BOA_WORKDIR) clean ; \

2
make/bridge.mk
View File

@ -48,6 +48,8 @@ $(TARGET_DIR)/sbin/brctl: $(BRIDGE_BUILD_DIR)/brctl/brctl
bridge: $(TARGET_DIR)/sbin/brctl
bridge-source: $(DL_DIR)/$(BRIDGE_SOURCE)
bridge-clean:
$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(BRIDGE_BUILD_DIR) uninstall
-$(MAKE) -C $(BRIDGE_BUILD_DIR) clean

2
make/ccache.mk
View File

@ -61,6 +61,8 @@ $(TARGET_DIR)/$(CCACHE_TARGET_BINARY): $(CCACHE_DIR2)/$(CCACHE_BINARY)
ccache_target: uclibc $(TARGET_DIR)/$(CCACHE_TARGET_BINARY)
ccache_target-sources: $(DL_DIR)/$(CCACHE_SOURCE)
ccache_target-clean:
$(MAKE) DESTDIR=$(TARGET_DIR) -C $(CCACHE_DIR2) uninstall
-$(MAKE) -C $(CCACHE_DIR2) clean

7
make/cramfsroot.mk
View File

@ -42,12 +42,11 @@ cramfsroot: cramfs
@rm -rf $(TARGET_DIR)/usr/info
$(CRAMFS_DIR)/mkcramfs -q -D $(SOURCE_DIR)/device_table.txt $(TARGET_DIR) $(IMAGE)
cramfsroot-source: $(DL_DIR)/$(GENEXT2_SOURCE)
cramfsroot-source: cramfs-source
cramfsroot-clean:
-$(MAKE) -C $(GENEXT2_DIR) clean
-$(MAKE) -C $(CRAMFS_DIR) clean
cramfsroot-dirclean:
rm -rf $(GENEXT2_DIR)
rm -rf $(CRAMFS_DIR)

2
make/flex.mk
View File

@ -17,7 +17,7 @@ $(DL_DIR)/$(FLEX_SOURCE):
$(DL_DIR)/$(FLEX_PATCH):
$(WGET) -P $(DL_DIR) $(FLEX_SITE)/$(FLEX_PATCH)
ed-source: $(DL_DIR)/$(FLEX_SOURCE) $(DL_DIR)/$(FLEX_PATCH)
flex-source: $(DL_DIR)/$(FLEX_SOURCE) $(DL_DIR)/$(FLEX_PATCH)
$(FLEX_DIR)/.unpacked: $(DL_DIR)/$(FLEX_SOURCE) $(DL_DIR)/$(FLEX_PATCH)
$(FLEX_CAT) $(DL_DIR)/$(FLEX_SOURCE) | tar -C $(BUILD_DIR) -xvf -

6
make/gcc-2.95.mk
View File

@ -48,6 +48,7 @@ endif
#
#############################################################
GCC_BUILD_DIR1:=$(TOOL_BUILD_DIR)/gcc-2.95-initial
$(DL_DIR)/$(GCC_SOURCE):
$(WGET) -P $(DL_DIR) $(GCC_SITE)/$(GCC_SOURCE)
@ -170,6 +171,7 @@ gcc2_95_initial-dirclean:
#
#############################################################
STLPORT_PATCH=$(SOURCE_DIR)/STLport-4.5.3.patch
$(DL_DIR)/$(STLPORT_SOURCE):
$(WGET) -P $(DL_DIR) $(STLPORT_SITE)/$(STLPORT_SOURCE)
@ -188,6 +190,8 @@ endif
stlport: $(STAGING_DIR)/lib/libstdc++.a
stlport-source: $(DL_DIR)/$(STLPORT_SOURCE)
stlport-clean:
rm -f $(STAGING_DIR)/lib/libstdc++*
rm -f $(STAGING_DIR)/include/c++*
@ -280,6 +284,8 @@ $(STAGING_DIR)/bin/$(ARCH)-uclibc-g++: $(GCC_BUILD_DIR2)/.compiled
gcc2_95: binutils uclibc-configured gcc2_95_initial uclibc \
$(STAGING_DIR)/bin/$(ARCH)-uclibc-g++ $(STLPORT_TARGET)
gcc2_95-source: $(DL_DIR)/$(GCC_SOURCE)
gcc2_95-clean:
rm -rf $(GCC_BUILD_DIR2)
rm -f $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)*

3
make/gcc-3.3.mk
View File

@ -56,6 +56,7 @@ endif
#
#############################################################
GCC_BUILD_DIR1:=$(TOOL_BUILD_DIR)/gcc-3.3-initial
$(DL_DIR)/$(GCC_SOURCE):
$(WGET) -P $(DL_DIR) $(GCC_SITE)/$(GCC_SOURCE)
@ -305,6 +306,8 @@ endif
gcc3_3: binutils uclibc-configured gcc3_3_initial $(LIBFLOAT_TARGET) uclibc \
$(GCC_BUILD_DIR2)/.installed $(GCC_TARGETS)
gcc3_3-source: $(DL_DIR)/$(GCC_SOURCE)
gcc3_3-clean:
rm -rf $(GCC_BUILD_DIR2)
rm -f $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)*

2
make/gdb.mk
View File

@ -60,6 +60,8 @@ $(TARGET_DIR)/usr/bin/gdb: $(GDB_DIR)/gdb/gdb
gdb: $(TARGET_DIR)/usr/bin/gdb
gdb-source: $(DL_DIR)/$(GDB_SOURCE)
gdb-clean:
$(MAKE) -C $(GDB_DIR) clean

2
make/gettext.mk
View File

@ -13,7 +13,7 @@ GETTEXT_TARGET_BINARY:=usr/bin/gettext
$(DL_DIR)/$(GETTEXT_SOURCE):
$(WGET) -P $(DL_DIR) $(GETTEXT_SITE)/$(GETTEXT_SOURCE)
ed-source: $(DL_DIR)/$(GETTEXT_SOURCE)
gettext-source: $(DL_DIR)/$(GETTEXT_SOURCE)
$(GETTEXT_DIR)/.unpacked: $(DL_DIR)/$(GETTEXT_SOURCE)
$(GETTEXT_CAT) $(DL_DIR)/$(GETTEXT_SOURCE) | tar -C $(BUILD_DIR) -xvf -

2
make/hostap.mk
View File

@ -9,7 +9,7 @@ HOSTAP_DIR=$(BUILD_DIR)/hostap-snapshot
HOSTAP_TARGET_MODULE_DIR=$(TARGET_DIR)/lib/modules/$(LINUX_VERSION)/hostap
$(DL_DIR)/$(HOSTAP_SOURCE):
$(WGET) -P $(DL_DIR) $(HOSTAP_SOURCE_URL) -O $(DL_DIR)/$(HOSTAP_SOURCE)
$(WGET) -P $(DL_DIR) $(HOSTAP_SOURCE_URL) -O $(DL_DIR)/$(HOSTAP_SOURCE)
hostap-source: $(DL_DIR)/$(HOSTAP_SOURCE)

2
make/hotplug.mk
View File

@ -28,7 +28,7 @@ $(TARGET_DIR)/sbin/hotplug: $(HOTPLUG_DIR)/hotplug
hotplug: uclibc $(TARGET_DIR)/sbin/hotplug
ext2root-source: $(DL_DIR)/$(HOTPLUG_SOURCE)
hotplug-source: $(DL_DIR)/$(HOTPLUG_SOURCE)
hotplug-clean:
rm -f $(TARGET_DIR)/sbin/hotplug

2
make/iptables.mk
View File

@ -34,6 +34,8 @@ $(TARGET_DIR)/sbin/iptables: $(IPTABLES_BUILD_DIR)/iptables
iptables: $(TARGET_DIR)/sbin/iptables
iptables-source: $(DL_DIR)/$(IPTABLES_SOURCE)
iptables-clean:
$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(IPTABLES_BUILD_DIR) uninstall
-$(MAKE) -C $(IPTABLES_BUILD_DIR) clean

8
make/kernel-headers.mk
View File

@ -50,13 +50,15 @@ $(LINUX_DIR)/.configured: $(LINUX_DIR)/.unpacked
$(LINUX_KERNEL): $(LINUX_DIR)/.configured
system-linux: $(LINUX_DIR)/.configured
kernel-headers: $(LINUX_DIR)/.configured
system-linux-clean: clean
kernel-headers-source: $(DL_DIR)/$(LINUX_SOURCE)
kernel-headers-clean: clean
rm -f $(LINUX_KERNEL)
rm -rf $(LINUX_DIR)
system-linux-dirclean:
kernel-headers-dirclean:
rm -rf $(LINUX_DIR)
endif

2
make/linux.mk
View File

@ -95,6 +95,8 @@ $(STAGING_DIR)/include/linux/version.h: $(LINUX_DIR)/.configured
linux: $(STAGING_DIR)/include/linux/version.h $(TARGET_DIR)/lib/modules/$(LINUX_VERSION)/modules.dep
linux-source: $(DL_DIR)/$(LINUX_SOURCE)
# This has been renamed so we do _NOT_ by default run this on 'make clean'
linuxclean: clean
rm -f $(LINUX_KERNEL)

4
make/ncurses.mk
View File

@ -5,7 +5,7 @@
#
#############################################################
# Copyright (C) 2002 by Ken Restivo <ken@246gt.com>
# $Id: ncurses.mk,v 1.28 2003/11/01 05:34:39 mjn3 Exp $
# $Id: ncurses.mk,v 1.29 2003/11/12 09:31:12 andersen Exp $
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU Library General Public License as
@ -118,6 +118,8 @@ $(TARGET_DIR)/usr/lib/libncurses.a: $(STAGING_DIR)/lib/libncurses.a
ncurses-headers: $(TARGET_DIR)/usr/lib/libncurses.a
ncurses-source: $(DL_DIR)/$(NCURSES_SOURCE)
ncurses-clean:
rm -f $(STAGING_DIR)/lib/libncurses.so* $(TARGET_DIR)/lib/libncurses.so*
rm -f $(STAGING_DIR)/usr/share/tabset $(TARGET_DIR)/usr/share/tabset

2
make/netsnmp.mk
View File

@ -95,6 +95,8 @@ netsnmp-headers: $(TARGET_DIR)/usr/include/net-snmp/net-snmp-config.h
cp -a $(STAGING_DIR)/include/net-snmp $(TARGET_DIR)/usr/include/net-snmp
cp -a $(STAGING_DIR)/include/ucd-snmp $(TARGET_DIR)/usr/include/net-snmp
netsnmp-source: $(DL_DIR)/$(NETSNMP_SOURCE)
netsnmp-clean:
$(MAKE) -C $(NETSNMP_DIR) clean

2
make/newt.mk
View File

@ -61,6 +61,8 @@ $(TARGET_DIR)/lib/libnewt.so.$(NEWT_VERSION): $(STAGING_DIR)/lib/libnewt.a
newt: uclibc slang $(TARGET_DIR)/lib/libnewt.so.$(NEWT_VERSION)
newt-source: $(DL_DIR)/$(NEWT_SOURCE)
newt-clean:
rm -f $(TARGET_DIR)/lib/libnewt.so*
-$(MAKE) -C $(NEWT_DIR) clean

2
make/openssh.mk
View File

@ -66,6 +66,8 @@ $(TARGET_DIR)/usr/bin/ssh: $(OPENSSH_DIR)/ssh
openssh: $(TARGET_DIR)/usr/bin/ssh
openssh-source: $(DL_DIR)/$(OPENSSH_SOURCE)
openssh-clean:
$(MAKE) -C $(OPENSSH_DIR) clean

6
make/openssl.mk
View File

@ -63,6 +63,10 @@ $(TARGET_DIR)/usr/lib/libssl.a: $(STAGING_DIR)/lib/libcrypto.a
openssl-headers: $(TARGET_DIR)/usr/lib/libssl.a
openssl: uclibc $(TARGET_DIR)/usr/lib/libcrypto.so.0.9.7
openssl-source: $(DL_DIR)/$(OPENSSL_SOURCE)
openssl-clean:
rm -f $(STAGING_DIR)/bin/openssl $(TARGET_DIR)/bin/openssl
rm -f $(STAGING_DIR)/lib/libcrypto.so* $(TARGET_DIR)/lib/libcrypto.so*
@ -72,5 +76,3 @@ openssl-clean:
openssl-dirclean:
rm -rf $(OPENSSL_DIR)
openssl: uclibc $(TARGET_DIR)/usr/lib/libcrypto.so.0.9.7

2
make/sfdisk.mk
View File

@ -25,6 +25,8 @@ $(TARGET_DIR)/sbin/sfdisk: $(SFDISK_DIR)/sfdisk
sfdisk: uclibc $(TARGET_DIR)/sbin/sfdisk
sfdisk-source: $(DL_DIR)/$(SFDISK_SOURCE)
sfdisk-clean:
rm -f $(TARGET_DIR)/sbin/sfdisk
-$(MAKE) -C $(SFDISK_DIR) clean

2
make/socat.mk
View File

@ -55,6 +55,8 @@ $(SOCAT_WORKDIR)/.installed: $(SOCAT_WORKDIR)/socat
socat: uclibc $(SOCAT_WORKDIR)/.installed
socat-source: $(DL_DIR)/$(SOCAT_SOURCE)
socat-clean:
@if [ -d $(SOCAT_WORKDIR)/Makefile ] ; then \
$(MAKE) -C $(SOCAT_WORKDIR) clean ; \

2
make/tinyx.mk
View File

@ -116,6 +116,8 @@ $(TINYX_LIBX)/libX11.so.6.2: $(TINYX_XFBDEV)
tinyx: zlib $(TINYX_LIBX)/libX11.so.6.2 $(TINYX_BINX)/Xfbdev
tinyx-source: $(DL_DIR)/$(TINYX_SOURCE)
tinyx-clean:
-rm -rf $(TARGET_DIR)/usr/X11R6
-$(MAKE) -C $(TINYX_DIR) clean

2
make/tn5250.mk
View File

@ -39,6 +39,8 @@ $(TARGET_DIR)/usr/bin/tn5250: $(TN5250_DIR)/tn5250
tn5250: uclibc slang $(TARGET_DIR)/usr/bin/tn5250
tn5250-source: $(DL_DIR)/$(TN5250_SOURCE)
tn5250-clean:
$(MAKE) -C $(TN5250_DIR) clean

2
make/ttcp.mk
View File

@ -27,6 +27,8 @@ $(TARGET_DIR)/usr/bin/ttcp: $(TTCP_BUILD_DIR)/ttcp
ttcp: $(TARGET_DIR)/usr/bin/ttcp
ttcp-source: $(DL_DIR)/$(TTCP_SOURCE)
ttcp-clean:
rm -f $(TTCP_BUILD_DIR)/*.o $(TTCP_BUILD_DIR)/ttcp

6
make/uclibc.mk
View File

@ -32,8 +32,6 @@ UCLIBC_TARGET_ARCH:=$(shell echo $(ARCH) | sed -e s'/-.*//' \
$(DL_DIR)/$(UCLIBC_SOURCE):
$(WGET) -P $(DL_DIR) $(UCLIBC_SITE)/$(UCLIBC_SOURCE)
uclibc-source: $(DL_DIR)/$(UCLIBC_SOURCE) #$(UCLIBC_PATCH)
$(UCLIBC_DIR)/.unpacked: $(DL_DIR)/$(UCLIBC_SOURCE)
bzcat $(DL_DIR)/$(UCLIBC_SOURCE) | tar -C $(BUILD_DIR) -xvf -
touch $(UCLIBC_DIR)/.unpacked
@ -97,6 +95,10 @@ uclibc-configured: $(UCLIBC_DIR)/.configured
uclibc: $(STAGING_DIR)/bin/$(ARCH)-linux-gcc $(STAGING_DIR)/lib/libc.a \
$(UCLIBC_TARGETS)
uclibc-source: $(DL_DIR)/$(UCLIBC_SOURCE)
uclibc-configured-source: uclibc-source
uclibc-clean:
-$(MAKE) -C $(UCLIBC_DIR) clean
rm -f $(UCLIBC_DIR)/.config

2
make/util-linux.mk
View File

@ -49,6 +49,8 @@ $(UTIL-LINUX_TARGET_BINARY): $(UTIL-LINUX_BINARY)
util-linux: uclibc $(UTIL-LINUX_TARGET_BINARY)
util-linux-source: $(DL_DIR)/$(UTIL-LINUX_SOURCE)
util-linux-clean:
#There is no working 'uninstall' target. Just skip it...
#$(MAKE) DESTDIR=$(TARGET_DIR) -C $(UTIL-LINUX_DIR) uninstall

2
make/valgrind.mk
View File

@ -78,6 +78,8 @@ else
valgrind:
endif
valgrind-source: $(DL_DIR)/$(VALGRIND_SOURCE)
valgrind-clean:
$(MAKE) -C $(VALGRIND_DIR) clean

2
make/wtools.mk
View File

@ -32,6 +32,8 @@ $(TARGET_DIR)/sbin/iwconfig: $(WTOOLS_BUILD_DIR)/iwconfig
wtools: $(TARGET_DIR)/sbin/iwconfig
wtools-source: $(DL_DIR)/$(WTOOLS_SOURCE)
wtools-clean:
$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(WTOOLS_BUILD_DIR) uninstall
-$(MAKE) -C $(WTOOLS_BUILD_DIR) clean

2
make/zlib.mk
View File

@ -61,6 +61,8 @@ zlib-headers: $(TARGET_DIR)/usr/lib/libz.a
zlib: uclibc $(TARGET_DIR)/lib/libz.so.1.1.4
zlib-source: $(DL_DIR)/$(ZLIB_SOURCE)
zlib-clean:
rm -f $(TARGET_DIR)/lib/libz.so*
-$(MAKE) -C $(ZLIB_DIR) clean