diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2006-10-20 09:53:04 +0000 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2006-10-20 09:53:04 +0000 |
| commit | a81633e35bf595208cf9f6631b460eb17d56bab4 (patch) | |
| tree | 7768f74bc5a1f0a1284bfce925ed456e4d79259a | |
| parent | b3cc5c22dd871bd2565483ec866ad4349657ade4 (diff) | |
| parent | 8fc2a1a6a196fa3de97f1abadecf778689ad29ba (diff) | |
merge of '3620468cc84d19eb4000fb2adf648ce594360b81'
and 'caeaa1c1178745edaf9e570da28905beabafc0fd'
4 files changed, 19 insertions, 2 deletions
diff --git a/packages/glibc/glibc_2.4.bb b/packages/glibc/glibc_2.4.bb index b0f0396979..dc844ea1d2 100644 --- a/packages/glibc/glibc_2.4.bb +++ b/packages/glibc/glibc_2.4.bb @@ -5,6 +5,8 @@ SECTION = "libs" PRIORITY = "required" PR = "r10" +#add the hosts that are confirmed to be working to COMPATIBLE_HOSTi +COMPATIBLE_HOST = '(i.86.*-linux|sh.*-linux)' DEFAULT_PREFERENCE_arm = "-1" # the -isystem in bitbake.conf screws up glibc do_stage diff --git a/packages/uboot/u-boot-LABEL.2006.06.30.2020/.mtn2git_empty b/packages/uboot/u-boot-LABEL.2006.06.30.2020/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/uboot/u-boot-LABEL.2006.06.30.2020/.mtn2git_empty diff --git a/packages/uboot/u-boot-LABEL.2006.06.30.2020/nohelloworld.patch b/packages/uboot/u-boot-LABEL.2006.06.30.2020/nohelloworld.patch new file mode 100644 index 0000000000..d98cefe28e --- /dev/null +++ b/packages/uboot/u-boot-LABEL.2006.06.30.2020/nohelloworld.patch @@ -0,0 +1,14 @@ +Index: git/examples/Makefile +=================================================================== +--- git.orig/examples/Makefile 2006-10-20 09:53:20.000000000 +0200 ++++ git/examples/Makefile 2006-10-20 10:17:55.658554000 +0200 +@@ -59,9 +59,6 @@ + + include $(TOPDIR)/config.mk + +-SREC = hello_world.srec +-BIN = hello_world.bin hello_world +- + ifeq ($(CPU),mpc8xx) + SREC = test_burst.srec + BIN = test_burst.bin test_burst diff --git a/packages/uboot/u-boot_LABEL.2006.06.30.2020.bb b/packages/uboot/u-boot_LABEL.2006.06.30.2020.bb index cec4c0eca2..5bf12bcaa0 100644 --- a/packages/uboot/u-boot_LABEL.2006.06.30.2020.bb +++ b/packages/uboot/u-boot_LABEL.2006.06.30.2020.bb @@ -4,11 +4,12 @@ SECTION = "bootloader" PRIORITY = "optional" LICENSE = "GPL" -PR = "r1" +PR = "r2" TAG = "${@bb.data.getVar('PV',d,1).replace('.', '_')}" -SRC_URI = "git://www.denx.de/git/u-boot.git;protocol=git;tag=${TAG}" +SRC_URI = "git://www.denx.de/git/u-boot.git;protocol=git;tag=${TAG} \ + file://nohelloworld.patch;patch=1" # file://config.patch;patch=1" SRC_URI_append_navman-icn330 = " http://www.duff.dk/navman/navman-u-boot-2006-30-2020.patch;patch=1" |