jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-27 21:26:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

support: move patch-kernel.sh and rename it

Browse Source 
The name "patch-kernel.sh" is a bit stupid, since this script is used
to patch everything in Buildroot, not only kernel trees.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Thomas Petazzoni 2011-08-31 23:35:04 +02:00 committed by Peter Korsgaard
parent 20f8a7dec6
commit 59a326b934
32 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot/uboot/uboot.mk
View File

@ -52,7 +52,7 @@ endef
ifneq ($(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR)),) ifneq ($(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR)),)
define UBOOT_APPLY_CUSTOM_PATCHES define UBOOT_APPLY_CUSTOM_PATCHES
toolchain/patch-kernel.sh $(@D) $(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR) \ support/scripts/apply-patches.sh $(@D) $(BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR) \
uboot-$(UBOOT_VERSION)-\*.patch uboot-$(UBOOT_VERSION)-\*.patch
endef endef

6
linux/linux.mk
View File

@ -100,11 +100,11 @@ LINUX_POST_DOWNLOAD_HOOKS += LINUX_DOWNLOAD_PATCHES
define LINUX_APPLY_PATCHES define LINUX_APPLY_PATCHES
for p in $(LINUX_PATCHES) ; do \ for p in $(LINUX_PATCHES) ; do \
if echo $$p | grep -q -E "^ftp://|^http://" ; then \ if echo $$p | grep -q -E "^ftp://|^http://" ; then \
toolchain/patch-kernel.sh $(@D) $(DL_DIR) `basename $$p` ; \ support/scripts/apply-patches.sh $(@D) $(DL_DIR) `basename $$p` ; \
elif test -d $$p ; then \ elif test -d $$p ; then \
toolchain/patch-kernel.sh $(@D) $$p linux-\*.patch ; \ support/scripts/apply-patches.sh $(@D) $$p linux-\*.patch ; \
else \ else \
toolchain/patch-kernel.sh $(@D) `dirname $$p` `basename $$p` ; \ support/scripts/apply-patches.sh $(@D) `dirname $$p` `basename $$p` ; \
fi \ fi \
done done
endef endef

12
package/Makefile.autotools.in
View File

@ -152,11 +152,11 @@ define LIBTOOL_PATCH_HOOK
ltmain_version=`sed -n '/^[ ]*VERSION=/{s/^[ ]*VERSION=//;p;q;}' $$$$i | \ ltmain_version=`sed -n '/^[ ]*VERSION=/{s/^[ ]*VERSION=//;p;q;}' $$$$i | \
sed -e 's/\([0-9].[0-9]*\).*/\1/' -e 's/\"//'`; \ sed -e 's/\([0-9].[0-9]*\).*/\1/' -e 's/\"//'`; \
if test $$$${ltmain_version} = '1.5'; then \ if test $$$${ltmain_version} = '1.5'; then \
toolchain/patch-kernel.sh $$$${i%/*} support/libtool buildroot-libtool-v1.5.patch; \ support/scripts/apply-patches.sh $$$${i%/*} support/libtool buildroot-libtool-v1.5.patch; \
elif test $$$${ltmain_version} = "2.2"; then\ elif test $$$${ltmain_version} = "2.2"; then\
toolchain/patch-kernel.sh $$$${i%/*} support/libtool buildroot-libtool-v2.2.patch; \ support/scripts/apply-patches.sh $$$${i%/*} support/libtool buildroot-libtool-v2.2.patch; \
elif test $$$${ltmain_version} = "2.4"; then\ elif test $$$${ltmain_version} = "2.4"; then\
toolchain/patch-kernel.sh $$$${i%/*} support/libtool buildroot-libtool-v2.4.patch; \ support/scripts/apply-patches.sh $$$${i%/*} support/libtool buildroot-libtool-v2.4.patch; \
fi \ fi \
done \ done \
fi fi
@ -177,11 +177,11 @@ define AUTORECONF_HOOK
for i in `find $$($$(PKG)_SRCDIR) -name ltmain.sh`; do \ for i in `find $$($$(PKG)_SRCDIR) -name ltmain.sh`; do \
ltmain_version=`sed -n '/^[ ]*VERSION=/{s/^[ ]*VERSION=//;p;q;}' $$$$i | sed 's/\([0-9].[0-9]*\).*/\1/'`; \ ltmain_version=`sed -n '/^[ ]*VERSION=/{s/^[ ]*VERSION=//;p;q;}' $$$$i | sed 's/\([0-9].[0-9]*\).*/\1/'`; \
if test $$$${ltmain_version} = "1.5"; then \ if test $$$${ltmain_version} = "1.5"; then \
toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool-v1.5.patch; \ support/scripts/apply-patches.sh $$$${i%/*} package buildroot-libtool-v1.5.patch; \
elif test $$$${ltmain_version} = "2.2"; then\ elif test $$$${ltmain_version} = "2.2"; then\
toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool-v2.2.patch; \ support/scripts/apply-patches.sh $$$${i%/*} package buildroot-libtool-v2.2.patch; \
elif test $$$${ltmain_version} = "2.4"; then\ elif test $$$${ltmain_version} = "2.4"; then\
toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool-v2.4.patch; \ support/scripts/apply-patches.sh $$$${i%/*} package buildroot-libtool-v2.4.patch; \
fi \ fi \
done \ done \
fi fi

8
package/Makefile.package.in
View File

@ -259,15 +259,15 @@ $(BUILD_DIR)/%/.stamp_extracted:
$(BUILD_DIR)/%/.stamp_patched: NAMEVER = $(RAWNAME)-$($(PKG)_VERSION) $(BUILD_DIR)/%/.stamp_patched: NAMEVER = $(RAWNAME)-$($(PKG)_VERSION)
$(BUILD_DIR)/%/.stamp_patched: $(BUILD_DIR)/%/.stamp_patched:
@$(call MESSAGE,"Patching $($(PKG)_DIR_PREFIX)/$(RAWNAME)") @$(call MESSAGE,"Patching $($(PKG)_DIR_PREFIX)/$(RAWNAME)")
$(if $($(PKG)_PATCH),toolchain/patch-kernel.sh $(@D) $(DL_DIR) $($(PKG)_PATCH)) $(if $($(PKG)_PATCH),support/scripts/apply-patches.sh $(@D) $(DL_DIR) $($(PKG)_PATCH))
$(Q)( \ $(Q)( \
if test -d $($(PKG)_DIR_PREFIX)/$(RAWNAME); then \ if test -d $($(PKG)_DIR_PREFIX)/$(RAWNAME); then \
if test "$(wildcard $($(PKG)_DIR_PREFIX)/$(RAWNAME)/$(NAMEVER)*.patch*)"; then \ if test "$(wildcard $($(PKG)_DIR_PREFIX)/$(RAWNAME)/$(NAMEVER)*.patch*)"; then \
toolchain/patch-kernel.sh $(@D) $($(PKG)_DIR_PREFIX)/$(RAWNAME) $(NAMEVER)\*.patch $(NAMEVER)\*.patch.$(ARCH) || exit 1; \ support/scripts/apply-patches.sh $(@D) $($(PKG)_DIR_PREFIX)/$(RAWNAME) $(NAMEVER)\*.patch $(NAMEVER)\*.patch.$(ARCH) || exit 1; \
else \ else \
toolchain/patch-kernel.sh $(@D) $($(PKG)_DIR_PREFIX)/$(RAWNAME) $(RAWNAME)\*.patch $(RAWNAME)\*.patch.$(ARCH) || exit 1; \ support/scripts/apply-patches.sh $(@D) $($(PKG)_DIR_PREFIX)/$(RAWNAME) $(RAWNAME)\*.patch $(RAWNAME)\*.patch.$(ARCH) || exit 1; \
if test -d $($(PKG)_DIR_PREFIX)/$(RAWNAME)/$(NAMEVER); then \ if test -d $($(PKG)_DIR_PREFIX)/$(RAWNAME)/$(NAMEVER); then \
toolchain/patch-kernel.sh $(@D) $($(PKG)_DIR_PREFIX)/$(RAWNAME)/$(NAMEVER) \*.patch \*.patch.$(ARCH) || exit 1; \ support/scripts/apply-patches.sh $(@D) $($(PKG)_DIR_PREFIX)/$(RAWNAME)/$(NAMEVER) \*.patch \*.patch.$(ARCH) || exit 1; \
fi; \ fi; \
fi; \ fi; \
fi; \ fi; \

2
package/argus/argus.mk
View File

@ -11,7 +11,7 @@ ARGUS_DEPENDENCIES=libpcap
define ARGUS_DEBIAN_PATCH_APPLY define ARGUS_DEBIAN_PATCH_APPLY
if [ -d $(@D)/debian/patches ]; then \ if [ -d $(@D)/debian/patches ]; then \
toolchain/patch-kernel.sh $(@D) $(@D)/debian/patches \*.patch; \ support/scripts/apply-patches.sh $(@D) $(@D)/debian/patches \*.patch; \
fi fi
endef endef

2
package/cups/cups.mk
View File

@ -69,7 +69,7 @@ $(DL_DIR)/$(CUPS_SOURCE):
$(CUPS_DIR)/.unpacked: $(DL_DIR)/$(CUPS_SOURCE) $(CUPS_DIR)/.unpacked: $(DL_DIR)/$(CUPS_SOURCE)
$(CUPS_CAT) $(DL_DIR)/$(CUPS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - $(CUPS_CAT) $(DL_DIR)/$(CUPS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(CUPS_DIR) package/cups/ \*.patch support/scripts/apply-patches.sh $(CUPS_DIR) package/cups/ \*.patch
$(CONFIG_UPDATE) $(CUPS_DIR) $(CONFIG_UPDATE) $(CUPS_DIR)
touch $@ touch $@

2
package/cvs/cvs.mk
View File

@ -37,7 +37,7 @@ define CVS_DEBIAN_PATCHES
do $(SED) 's,^\+\+\+ .*cvs-$(CVS_VERSION)/,+++ cvs-$(CVS_VERSION)/,' $$i; \ do $(SED) 's,^\+\+\+ .*cvs-$(CVS_VERSION)/,+++ cvs-$(CVS_VERSION)/,' $$i; \
done; \ done; \
); \ ); \
toolchain/patch-kernel.sh $(@D) $(@D)/debian/patches \*; \ support/scripts/apply-patches.sh $(@D) $(@D)/debian/patches \*; \
fi fi
endef endef
endif endif

2
package/fis/fis.mk
View File

@ -18,7 +18,7 @@ fis-source: $(DL_DIR)/$(FIS_SOURCE)
$(FIS_DIR)/.unpacked: $(DL_DIR)/$(FIS_SOURCE) $(FIS_DIR)/.unpacked: $(DL_DIR)/$(FIS_SOURCE)
mkdir -p $(FIS_DIR) mkdir -p $(FIS_DIR)
cp -f $(DL_DIR)/$(FIS_SOURCE) $(FIS_DIR) cp -f $(DL_DIR)/$(FIS_SOURCE) $(FIS_DIR)
toolchain/patch-kernel.sh $(FIS_DIR) package/fis \*.patch support/scripts/apply-patches.sh $(FIS_DIR) package/fis \*.patch
touch $@ touch $@
$(FIS_DIR)/$(FIS_BINARY): $(FIS_DIR)/.unpacked $(FIS_DIR)/$(FIS_BINARY): $(FIS_DIR)/.unpacked

2
package/gettext/gettext.mk
View File

@ -24,7 +24,7 @@ gettext-source: $(DL_DIR)/$(GETTEXT_SOURCE)
$(GETTEXT_DIR)/.unpacked: $(DL_DIR)/$(GETTEXT_SOURCE) $(GETTEXT_DIR)/.unpacked: $(DL_DIR)/$(GETTEXT_SOURCE)
$(GETTEXT_CAT) $(DL_DIR)/$(GETTEXT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - $(GETTEXT_CAT) $(DL_DIR)/$(GETTEXT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(GETTEXT_DIR) package/gettext/ gettext\*.patch support/scripts/apply-patches.sh $(GETTEXT_DIR) package/gettext/ gettext\*.patch
$(CONFIG_UPDATE) $(@D) $(CONFIG_UPDATE) $(@D)
$(CONFIG_UPDATE) $(GETTEXT_DIR)/build-aux $(CONFIG_UPDATE) $(GETTEXT_DIR)/build-aux
touch $@ touch $@

2
package/input-tools/input-tools.mk
View File

@ -15,7 +15,7 @@ INPUT_TOOLS_TARGETS_$(BR2_PACKAGE_INPUT_TOOLS_JSTEST) += jstest
define INPUT_TOOLS_DEBIAN_PATCHES define INPUT_TOOLS_DEBIAN_PATCHES
if [ -d $(@D)/debian/patches ]; then \ if [ -d $(@D)/debian/patches ]; then \
toolchain/patch-kernel.sh $(@D) $(@D)/debian/patches \*.patch; \ support/scripts/apply-patches.sh $(@D) $(@D)/debian/patches \*.patch; \
fi fi
endef endef

2
package/libeXosip2/libeXosip2.mk
View File

@ -18,7 +18,7 @@ define LIBEXOSIP2_DEBIAN_PATCHES
do $(SED) 's,^\+\+\+ .*cvs-$(LIBEXOSIP2_VERSION)/,+++ cvs-$(LIBEXOSIP2_VERSION)/,' $$i; \ do $(SED) 's,^\+\+\+ .*cvs-$(LIBEXOSIP2_VERSION)/,+++ cvs-$(LIBEXOSIP2_VERSION)/,' $$i; \
done; \ done; \
); \ ); \
toolchain/patch-kernel.sh $(@D) $(@D)/debian/patches \*; \ support/scripts/apply-patches.sh $(@D) $(@D)/debian/patches \*; \
fi fi
endef endef
endif endif

2
package/libgtk2/libgtk2.mk
View File

@ -139,7 +139,7 @@ HOST_LIBGTK2_CONF_OPT = \
--disable-debug --disable-debug
define HOST_LIBGTK2_PATCH_REDUCE_DEPENDENCIES_HOOK define HOST_LIBGTK2_PATCH_REDUCE_DEPENDENCIES_HOOK
toolchain/patch-kernel.sh $(@D) $($(PKG)_DIR_PREFIX)/$(RAWNAME) host-*.patch support/scripts/apply-patches.sh $(@D) $($(PKG)_DIR_PREFIX)/$(RAWNAME) host-*.patch
endef endef
HOST_LIBGTK2_POST_PATCH_HOOKS += HOST_LIBGTK2_PATCH_REDUCE_DEPENDENCIES_HOOK HOST_LIBGTK2_POST_PATCH_HOOKS += HOST_LIBGTK2_PATCH_REDUCE_DEPENDENCIES_HOOK

2
package/libosip2/libosip2.mk
View File

@ -16,7 +16,7 @@ define LIBOSIP2_DEBIAN_PATCHES
do $(SED) 's,^\+\+\+ .*cvs-$(LIBOSIP2_VERSION)/,+++ cvs-$(LIBOSIP2_VERSION)/,' $$i; \ do $(SED) 's,^\+\+\+ .*cvs-$(LIBOSIP2_VERSION)/,+++ cvs-$(LIBOSIP2_VERSION)/,' $$i; \
done; \ done; \
); \ ); \
toolchain/patch-kernel.sh $(@D) $(@D)/debian/patches \*; \ support/scripts/apply-patches.sh $(@D) $(@D)/debian/patches \*; \
fi fi
endef endef
endif endif

2
package/mii-diag/mii-diag.mk
View File

@ -10,7 +10,7 @@ MII_DIAG_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/m/mii-diag
define MII_DIAG_DEBIAN_PATCHES define MII_DIAG_DEBIAN_PATCHES
if [ -d $(@D)/debian/patches ]; then \ if [ -d $(@D)/debian/patches ]; then \
toolchain/patch-kernel.sh $(@D) $(@D)/debian/patches \*.patch; \ support/scripts/apply-patches.sh $(@D) $(@D)/debian/patches \*.patch; \
fi fi
endef endef

2
package/mutt/mutt.mk
View File

@ -16,7 +16,7 @@ MUTT_AUTORECONF=YES
define MUTT_APPLY_DEBIAN_PATCHES define MUTT_APPLY_DEBIAN_PATCHES
if [ -d $(@D)/debian/patches ]; then \ if [ -d $(@D)/debian/patches ]; then \
toolchain/patch-kernel.sh $(@D) $(@D)/debian/patches \*.patch; \ support/scripts/apply-patches.sh $(@D) $(@D)/debian/patches \*.patch; \
fi fi
endef endef

2
package/netkitbase/netkitbase.mk
View File

@ -22,7 +22,7 @@ $(NETKITBASE_DIR)/.unpacked: $(DL_DIR)/$(NETKITBASE_SOURCE)
$(SED) "s/main()/main(void)/;" $(NETKITBASE_DIR)/configure $(SED) "s/main()/main(void)/;" $(NETKITBASE_DIR)/configure
# don't try to run cross compiled binaries while configuring things # don't try to run cross compiled binaries while configuring things
$(SED) "s~./__conftest~#./__conftest~;" $(NETKITBASE_DIR)/configure $(SED) "s~./__conftest~#./__conftest~;" $(NETKITBASE_DIR)/configure
toolchain/patch-kernel.sh $(NETKITBASE_DIR) package/netkitbase/ netkitbase\*.patch support/scripts/apply-patches.sh $(NETKITBASE_DIR) package/netkitbase/ netkitbase\*.patch
touch $(NETKITBASE_DIR)/.unpacked touch $(NETKITBASE_DIR)/.unpacked
$(NETKITBASE_DIR)/.configured: $(NETKITBASE_DIR)/.unpacked $(NETKITBASE_DIR)/.configured: $(NETKITBASE_DIR)/.unpacked

2
package/netkittelnet/netkittelnet.mk
View File

@ -23,7 +23,7 @@ $(NETKITTELNET_DIR)/.unpacked: $(DL_DIR)/$(NETKITTELNET_SOURCE)
# Disable termcap support # Disable termcap support
$(SED) "s~\(.*termcap\.h.*\)~/* \1 */~;" $(NETKITTELNET_DIR)/telnetd/telnetd.c $(SED) "s~\(.*termcap\.h.*\)~/* \1 */~;" $(NETKITTELNET_DIR)/telnetd/telnetd.c
# don't try to run cross compiled binaries while configuring things # don't try to run cross compiled binaries while configuring things
toolchain/patch-kernel.sh $(NETKITTELNET_DIR) package/netkittelnet/ netkittelnet\*.patch support/scripts/apply-patches.sh $(NETKITTELNET_DIR) package/netkittelnet/ netkittelnet\*.patch
touch $(NETKITTELNET_DIR)/.unpacked touch $(NETKITTELNET_DIR)/.unpacked
$(NETKITTELNET_DIR)/.configured: $(NETKITTELNET_DIR)/.unpacked $(NETKITTELNET_DIR)/.configured: $(NETKITTELNET_DIR)/.unpacked

2
package/setserial/setserial.mk
View File

@ -13,7 +13,7 @@ define SETSERIAL_APPLY_DEBIAN_PATCHES
if [ -d $(@D)/debian/patches ]; then \ if [ -d $(@D)/debian/patches ]; then \
touch $(@D)/gorhack.h; \ touch $(@D)/gorhack.h; \
rm $(@D)/debian/patches/01_makefile.dpatch; \ rm $(@D)/debian/patches/01_makefile.dpatch; \
toolchain/patch-kernel.sh $(@D) $(@D)/debian/patches *.dpatch; \ support/scripts/apply-patches.sh $(@D) $(@D)/debian/patches *.dpatch; \
fi fi
endef endef

2
package/sfdisk/sfdisk.mk
View File

@ -14,7 +14,7 @@ $(DL_DIR)/$(SFDISK_SOURCE):
$(SFDISK_DIR)/.patched: $(DL_DIR)/$(SFDISK_SOURCE) $(SFDISK_DIR)/.patched: $(DL_DIR)/$(SFDISK_SOURCE)
$(SFDISK_CAT) $(DL_DIR)/$(SFDISK_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - $(SFDISK_CAT) $(DL_DIR)/$(SFDISK_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(SFDISK_DIR) package/sfdisk/ sfdisk.\*.patch support/scripts/apply-patches.sh $(SFDISK_DIR) package/sfdisk/ sfdisk.\*.patch
touch $@ touch $@

2
package/sysklogd/sysklogd.mk
View File

@ -15,7 +15,7 @@ endif
define SYSKLOGD_DEBIAN_PATCHES define SYSKLOGD_DEBIAN_PATCHES
if [ -d $(@D)/debian/patches ]; then \ if [ -d $(@D)/debian/patches ]; then \
toolchain/patch-kernel.sh $(@D) $(@D)/debian/patches \*.patch; \ support/scripts/apply-patches.sh $(@D) $(@D)/debian/patches \*.patch; \
fi fi
endef endef

2
package/sysvinit/sysvinit.mk
View File

@ -15,7 +15,7 @@ endif
define SYSVINIT_DEBIAN_PATCHES define SYSVINIT_DEBIAN_PATCHES
if [ -d $(@D)/debian/patches ]; then \ if [ -d $(@D)/debian/patches ]; then \
toolchain/patch-kernel.sh $(@D) $(@D)/debian/patches \*.patch; \ support/scripts/apply-patches.sh $(@D) $(@D)/debian/patches \*.patch; \
fi fi
endef endef

2
package/thttpd/thttpd.mk
View File

@ -11,7 +11,7 @@ THTTPD_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/t/thttpd/
ifneq ($(THTTPD_PATCH),) ifneq ($(THTTPD_PATCH),)
define THTTPD_DEBIAN_PATCHES define THTTPD_DEBIAN_PATCHES
if [ -d $(@D)/debian/patches ]; then \ if [ -d $(@D)/debian/patches ]; then \
toolchain/patch-kernel.sh $(@D) $(@D)/debian/patches \*.patch; \ support/scripts/apply-patches.sh $(@D) $(@D)/debian/patches \*.patch; \
fi fi
endef endef
endif endif

2
package/tinyhttpd/tinyhttpd.mk
View File

@ -23,7 +23,7 @@ tinyhttpd-source: $(DL_DIR)/$(TINYHTTPD_SOURCE)
############################################################# #############################################################
$(TINYHTTPD_DIR)/.unpacked: $(DL_DIR)/$(TINYHTTPD_SOURCE) $(TINYHTTPD_DIR)/.unpacked: $(DL_DIR)/$(TINYHTTPD_SOURCE)
$(TINYHTTPD_CAT) $(DL_DIR)/$(TINYHTTPD_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - $(TINYHTTPD_CAT) $(DL_DIR)/$(TINYHTTPD_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(TINYHTTPD_DIR) package/tinyhttpd/ tinyhttpd\*.patch support/scripts/apply-patches.sh $(TINYHTTPD_DIR) package/tinyhttpd/ tinyhttpd\*.patch
touch $(TINYHTTPD_DIR)/.unpacked touch $(TINYHTTPD_DIR)/.unpacked
$(TINYHTTPD_DIR)/$(TINYHTTPD_BINARY): $(TINYHTTPD_DIR)/.unpacked $(TINYHTTPD_DIR)/$(TINYHTTPD_BINARY): $(TINYHTTPD_DIR)/.unpacked

2
package/ttcp/ttcp.mk
View File

@ -15,7 +15,7 @@ $(DL_DIR)/$(TTCP_SOURCE):
$(TTCP_DIR)/.unpacked: $(DL_DIR)/$(TTCP_SOURCE) $(TTCP_DIR)/.unpacked: $(DL_DIR)/$(TTCP_SOURCE)
-mkdir $(TTCP_DIR) -mkdir $(TTCP_DIR)
cp -af $(DL_DIR)/$(TTCP_SOURCE) $(TTCP_DIR) cp -af $(DL_DIR)/$(TTCP_SOURCE) $(TTCP_DIR)
toolchain/patch-kernel.sh $(TTCP_DIR) package/ttcp/ ttcp-\*.patch support/scripts/apply-patches.sh $(TTCP_DIR) package/ttcp/ ttcp-\*.patch
touch $(TTCP_DIR)/.unpacked touch $(TTCP_DIR)/.unpacked
$(TTCP_DIR)/.configured: $(TTCP_DIR)/.unpacked $(TTCP_DIR)/.configured: $(TTCP_DIR)/.unpacked

2
package/uemacs/uemacs.mk
View File

@ -18,7 +18,7 @@ uemacs-source: $(DL_DIR)/$(UEMACS_SOURCE)
$(UEMACS_DIR)/.unpacked: $(DL_DIR)/$(UEMACS_SOURCE) $(UEMACS_DIR)/.unpacked: $(DL_DIR)/$(UEMACS_SOURCE)
$(UEMACS_CAT) $(DL_DIR)/$(UEMACS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - $(UEMACS_CAT) $(DL_DIR)/$(UEMACS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(UEMACS_DIR) package/uemacs/ uemacs\*.patch support/scripts/apply-patches.sh $(UEMACS_DIR) package/uemacs/ uemacs\*.patch
touch $(UEMACS_DIR)/.unpacked touch $(UEMACS_DIR)/.unpacked
$(UEMACS_DIR)/$(UEMACS_BINARY): $(UEMACS_DIR)/.unpacked $(UEMACS_DIR)/$(UEMACS_BINARY): $(UEMACS_DIR)/.unpacked

2
package/vpnc/vpnc.mk
View File

@ -19,7 +19,7 @@ $(DL_DIR)/$(VPNC_SOURCE):
$(VPNC_DIR)/.unpacked: $(DL_DIR)/$(VPNC_SOURCE) $(VPNC_DIR)/.unpacked: $(DL_DIR)/$(VPNC_SOURCE)
$(VPNC_CAT) $(DL_DIR)/$(VPNC_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - $(VPNC_CAT) $(DL_DIR)/$(VPNC_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(VPNC_DIR) package/vpnc vpnc-$(VPNC_VERSION)\*.patch support/scripts/apply-patches.sh $(VPNC_DIR) package/vpnc vpnc-$(VPNC_VERSION)\*.patch
touch $@ touch $@
$(VPNC_BINARY): $(VPNC_DIR)/.unpacked $(VPNC_BINARY): $(VPNC_DIR)/.unpacked

2
package/xfsprogs/xfsprogs.mk
View File

@ -24,7 +24,7 @@ xfsprogs-source: $(DL_DIR)/$(XFSPROGS_SOURCE)
$(XFSPROGS_DIR)/.unpacked: $(DL_DIR)/$(XFSPROGS_SOURCE) $(XFSPROGS_DIR)/.unpacked: $(DL_DIR)/$(XFSPROGS_SOURCE)
$(XFSPROGS_CAT) $(DL_DIR)/$(XFSPROGS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - $(XFSPROGS_CAT) $(DL_DIR)/$(XFSPROGS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(XFSPROGS_DIR) package/xfsprogs/ xfsprogs\*.patch support/scripts/apply-patches.sh $(XFSPROGS_DIR) package/xfsprogs/ xfsprogs\*.patch
touch $(XFSPROGS_DIR)/.unpacked touch $(XFSPROGS_DIR)/.unpacked
#XFSPROGS_CONFIG_SHARED:=--disable-shared #XFSPROGS_CONFIG_SHARED:=--disable-shared

0
toolchain/patch-kernel.sh → support/scripts/apply-patches.sh
View File

4
toolchain/gcc/gcc-uclibc-4.x.mk
View File

@ -207,12 +207,12 @@ gcc-patched: $(GCC_DIR)/.patched
$(GCC_DIR)/.patched: $(GCC_DIR)/.unpacked $(GCC_DIR)/.patched: $(GCC_DIR)/.unpacked
# Apply any files named gcc-*.patch from the source directory to gcc # Apply any files named gcc-*.patch from the source directory to gcc
ifneq ($(wildcard $(GCC_PATCH_DIR)),) ifneq ($(wildcard $(GCC_PATCH_DIR)),)
toolchain/patch-kernel.sh $(GCC_DIR) $(GCC_PATCH_DIR) \*.patch $(GCC_PATCH_EXTRA) support/scripts/apply-patches.sh $(GCC_DIR) $(GCC_PATCH_DIR) \*.patch $(GCC_PATCH_EXTRA)
endif endif
ifeq ($(ARCH)-$(BR2_GCC_SHARED_LIBGCC),powerpc-y) ifeq ($(ARCH)-$(BR2_GCC_SHARED_LIBGCC),powerpc-y)
ifneq ($(BR2_SOFT_FLOAT),) ifneq ($(BR2_SOFT_FLOAT),)
toolchain/patch-kernel.sh $(GCC_DIR) toolchain/gcc/$(GCC_VERSION) powerpc-link-with-math-lib.patch.conditional support/scripts/apply-patches.sh $(GCC_DIR) toolchain/gcc/$(GCC_VERSION) powerpc-link-with-math-lib.patch.conditional
endif endif
endif endif
touch $@ touch $@

2
toolchain/gdb/gdb.mk
View File

@ -36,7 +36,7 @@ ifeq ($(GDB_VERSION),snapshot)
ln -sf $(TOOLCHAIN_DIR)/$(shell tar jtf $(DL_DIR)/$(GDB_SOURCE) | head -1 | cut -d"/" -f1) $(GDB_DIR) ln -sf $(TOOLCHAIN_DIR)/$(shell tar jtf $(DL_DIR)/$(GDB_SOURCE) | head -1 | cut -d"/" -f1) $(GDB_DIR)
endif endif
ifneq ($(wildcard $(GDB_PATCH_DIR)),) ifneq ($(wildcard $(GDB_PATCH_DIR)),)
toolchain/patch-kernel.sh $(GDB_DIR) $(GDB_PATCH_DIR) \*.patch $(GDB_PATCH_EXTRA) support/scripts/apply-patches.sh $(GDB_DIR) $(GDB_PATCH_DIR) \*.patch $(GDB_PATCH_EXTRA)
endif endif
$(CONFIG_UPDATE) $(@D) $(CONFIG_UPDATE) $(@D)
touch $@ touch $@

4
toolchain/kernel-headers/kernel-headers.mk
View File

@ -55,10 +55,10 @@ $(LINUX_HEADERS_UNPACK_DIR)/.unpacked: $(DL_DIR)/$(LINUX_HEADERS_SOURCE)
touch $@ touch $@
$(LINUX_HEADERS_UNPACK_DIR)/.patched: $(LINUX_HEADERS_UNPACK_DIR)/.unpacked $(LINUX_HEADERS_DEPENDS) $(LINUX_HEADERS_UNPACK_DIR)/.patched: $(LINUX_HEADERS_UNPACK_DIR)/.unpacked $(LINUX_HEADERS_DEPENDS)
toolchain/patch-kernel.sh $(LINUX_HEADERS_UNPACK_DIR) toolchain/kernel-headers \ support/scripts/apply-patches.sh $(LINUX_HEADERS_UNPACK_DIR) toolchain/kernel-headers \
linux-$(LINUX_HEADERS_VERSION)-\*.patch{,.gz,.bz2} linux-$(LINUX_HEADERS_VERSION)-\*.patch{,.gz,.bz2}
ifneq ($(KERNEL_HEADERS_PATCH_DIR),) ifneq ($(KERNEL_HEADERS_PATCH_DIR),)
toolchain/patch-kernel.sh $(LINUX_HEADERS_UNPACK_DIR) $(KERNEL_HEADERS_PATCH_DIR) \ support/scripts/apply-patches.sh $(LINUX_HEADERS_UNPACK_DIR) $(KERNEL_HEADERS_PATCH_DIR) \
linux-$(LINUX_HEADERS_VERSION)-\*.patch{,.gz,.bz2} linux-$(LINUX_HEADERS_VERSION)-\*.patch{,.gz,.bz2}
endif endif
touch $@ touch $@

4
toolchain/uClibc/uclibc.mk
View File

@ -79,11 +79,11 @@ $(UCLIBC_DIR)/.unpacked: $(DL_DIR)/$(UCLIBC_SOURCE)
uclibc-patched: $(UCLIBC_DIR)/.patched uclibc-patched: $(UCLIBC_DIR)/.patched
$(UCLIBC_DIR)/.patched: $(UCLIBC_DIR)/.unpacked $(UCLIBC_DIR)/.patched: $(UCLIBC_DIR)/.unpacked
ifneq ($(BR2_UCLIBC_VERSION_SNAPSHOT),y) ifneq ($(BR2_UCLIBC_VERSION_SNAPSHOT),y)
toolchain/patch-kernel.sh $(UCLIBC_DIR) $(UCLIBC_PATCH_DIR) \ support/scripts/apply-patches.sh $(UCLIBC_DIR) $(UCLIBC_PATCH_DIR) \
uClibc-$(UCLIBC_VERSION)-\*.patch \ uClibc-$(UCLIBC_VERSION)-\*.patch \
uClibc-$(UCLIBC_VERSION)-\*.patch.$(ARCH) uClibc-$(UCLIBC_VERSION)-\*.patch.$(ARCH)
else else
toolchain/patch-kernel.sh $(UCLIBC_DIR) $(UCLIBC_PATCH_DIR) \ support/scripts/apply-patches.sh $(UCLIBC_DIR) $(UCLIBC_PATCH_DIR) \
uClibc.\*.patch uClibc.\*.patch.$(ARCH) uClibc.\*.patch uClibc.\*.patch.$(ARCH)
endif endif
touch $@ touch $@