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

Patch correctly kexec, make sure utils is built using HOSTCC

This commit is contained in:
Ulf Samuelsson 2007-07-24 14:06:13 +00:00
parent 29cc530407
commit cb726c166d
3 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
package/kexec/kexec-patch.sh Executable file
View File

@ -0,0 +1,16 @@
#!/bin/bash
SRCDIR=$1
PATCHDIR=$2
PATCHLIST=${PATCHDIR}/$3
do_patch()
{
cd ${SRCDIR}
for f in `cat ${PATCHLIST}` ; do
echo ${PATCHDIR}/$f
cat ${PATCHDIR}/$f | patch -p2
done
}
do_patch

17
package/kexec/kexec-tools-003-build-util-using-host-gcc.patch Normal file
View File

@ -0,0 +1,17 @@
diff -urN kexec-tools-1.101-0rig/util/Makefile kexec-tools-1.101/util/Makefile
--- kexec-tools-1.101-0rig/util/Makefile 2004-12-16 22:08:21.000000000 +0100
+++ kexec-tools-1.101/util/Makefile 2007-07-24 16:32:48.000000000 +0200
@@ -1,4 +1,4 @@
BIN_TO_HEX:= $(OBJDIR)/bin/bin-to-hex
$(BIN_TO_HEX): util/bin-to-hex.c
mkdir -p $(@D)
- $(BUILD_CC) $(BUILD_CFLAGS) $< -o $@
+ $(HOSTCC) $(HOST_CFLAGS) $< -o $@
diff -urN kexec-tools-1.101-0rig/util/Makefile~ kexec-tools-1.101/util/Makefile~
--- kexec-tools-1.101-0rig/util/Makefile~ 1970-01-01 01:00:00.000000000 +0100
+++ kexec-tools-1.101/util/Makefile~ 2004-12-16 22:08:21.000000000 +0100
@@ -0,0 +1,4 @@
+BIN_TO_HEX:= $(OBJDIR)/bin/bin-to-hex
+$(BIN_TO_HEX): util/bin-to-hex.c
+ mkdir -p $(@D)
+ $(BUILD_CC) $(BUILD_CFLAGS) $< -o $@

5
package/kexec/kexec.mk
View File

@ -35,9 +35,10 @@ $(KEXEC_DIR)/.unpacked: $(DL_DIR)/$(KEXEC_SOURCE) $(DL_DIR)/$(KEXEC_PATCH)
$(KEXEC_CAT) $(DL_DIR)/$(KEXEC_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
ifneq ($(KEXEC_PATCH),)
(cd $(KEXEC_DIR) && $(KEXEC_CAT) $(DL_DIR)/$(KEXEC_PATCH) | patch -p1)
toolchain/patch-kernel.sh $(KEXEC_DIR) $(KEXEC_DIR)/debian/patches \*.patch
package/kexec/kexec-patch.sh $(KEXEC_DIR) $(KEXEC_DIR)/debian/patches 00list
# toolchain/patch-kernel.sh $(KEXEC_DIR) $(KEXEC_DIR)/debian/patches \*.patch
endif
toolchain/patch-kernel.sh $(KEXEC_DIR) package/kexec/ kexec\*.dpatch
toolchain/patch-kernel.sh $(KEXEC_DIR) package/kexec/ kexec\*.patch
touch $@
$(KEXEC_DIR)/.configured: $(KEXEC_DIR)/.unpacked