diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-01-04 15:57:13 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-01-04 15:57:13 +0000 |
| commit | c365f60cbcfd55c56a5a414cc3951773832da35e (patch) | |
| tree | 100378f3fc21a4d8ac9e0bc63c338893ed55e09c | |
| parent | abcb81efda9e55f18e9c782aebd93f067e592be5 (diff) | |
| parent | d1b1c754d72fcaf47d9b312450c07ba200c22d8c (diff) | |
merge of '2c8930a5e3dfc1e355f0dede8fde6b887e2d33de'
and 'cf2bb56e5f6bd283e65c7bf7c89c86e77dbd1fb0'
71 files changed, 290 insertions, 447 deletions
diff --git a/conf/documentation.conf b/conf/documentation.conf index 392d1718b6..f5be55eb82 100644 --- a/conf/documentation.conf +++ b/conf/documentation.conf @@ -105,3 +105,6 @@ COMPATIBLE_HOST[doc] = "A regular expression which matches the HOST_SYS names su COMPATIBLE_MACHINE[doc] = "A regular expression which matches the MACHINES support by the package/file. Failure to match will cause the file to be skipped by the parser." SOURCE_MIRROR_FETCH[doc] = "Switch marking build as source fetcher. Used to skip COMPATIBLE_* checking." + +BBINCLUDELOGS[doc] = "Boolean switch to get log printed on failure." +BBINCLUDELOGS_LINES[doc] = "Amount of log lines printed on failure." diff --git a/conf/machine/a780.conf b/conf/machine/a780.conf index 1c3ae63025..8c3f768e8c 100644 --- a/conf/machine/a780.conf +++ b/conf/machine/a780.conf @@ -28,6 +28,6 @@ ROOT_FLASH_SIZE = "24" EXTRA_IMAGEDEPENDS += "ezx-boot-usb-native" # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. -include conf/machine/include/tune-xscale.conf +require conf/machine/include/tune-xscale.conf SERIAL_CONSOLE = "115200 ttyS0" diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf index 2682fb300f..fad73c53bf 100644 --- a/conf/machine/akita.conf +++ b/conf/machine/akita.conf @@ -2,8 +2,8 @@ #@NAME: Sharp Zaurus SL-C1000 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C1000 device -include conf/machine/include/zaurus-2.6.conf -include conf/machine/include/zaurus-clamshell.conf +require conf/machine/include/zaurus-2.6.conf +require conf/machine/include/zaurus-clamshell.conf PACKAGE_EXTRA_ARCHS += "iwmmxt" diff --git a/conf/machine/amsdelta.conf b/conf/machine/amsdelta.conf index 85afdc85f4..d4877a1724 100644 --- a/conf/machine/amsdelta.conf +++ b/conf/machine/amsdelta.conf @@ -21,7 +21,7 @@ GUI_MACHINE_CLASS="smallscreen" PREFERRED_VERSION_u-boot = "1.1.4" -TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t" +require conf/machine/include/tune-arm920t.conf IMAGE_ROOTFS_SIZE_ext2 = "8192" IMAGE_ROOTFS_SIZE_ext2.gz = "8192" diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf index d1afb882e3..098d0526f0 100644 --- a/conf/machine/c7x0.conf +++ b/conf/machine/c7x0.conf @@ -2,8 +2,8 @@ #@NAME: Sharp Zaurus SL-C7x0 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C700, Sharp Zaurus SL-C750, Sharp Zaurus SL-C760, Sharp Zaurus SL-C860 devices -include conf/machine/include/zaurus-2.6.conf -include conf/machine/include/zaurus-clamshell.conf +require conf/machine/include/zaurus-2.6.conf +require conf/machine/include/zaurus-clamshell.conf IMAGE_FSTYPES ?= "jffs2" diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf index e7e867e539..bfa8ace376 100644 --- a/conf/machine/collie.conf +++ b/conf/machine/collie.conf @@ -5,7 +5,7 @@ TARGET_ARCH = "arm" MACHINE_KERNEL_VERSION ?= "2.4" -include conf/machine/include/collie-${MACHINE_KERNEL_VERSION}.conf +require conf/machine/include/collie-${MACHINE_KERNEL_VERSION}.conf PREFERRED_PROVIDER_xserver = "xserver-kdrive" @@ -18,7 +18,7 @@ IMAGE_LINGUAS = "" IMAGE_FSTYPES ?= "jffs2 tar.gz" -include conf/machine/include/tune-strongarm.conf +require conf/machine/include/tune-strongarm.conf ROOT_FLASH_SIZE = "14" # actually 14680064, see EXTRA_IMAGECMD above diff --git a/conf/machine/compulab-pxa270.conf b/conf/machine/compulab-pxa270.conf index 78bcf6a6f8..3968bcb6f2 100644 --- a/conf/machine/compulab-pxa270.conf +++ b/conf/machine/compulab-pxa270.conf @@ -9,7 +9,7 @@ GUI_MACHINE_CLASS = "bigscreen" PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}" PACKAGE_EXTRA_ARCHS = "armv4 armv5te" -include conf/machine/include/tune-xscale.conf +require conf/machine/include/tune-xscale.conf # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttySA0" diff --git a/conf/machine/devkitidp-pxa255.conf b/conf/machine/devkitidp-pxa255.conf index 7d19d02439..029246a8c2 100644 --- a/conf/machine/devkitidp-pxa255.conf +++ b/conf/machine/devkitidp-pxa255.conf @@ -12,7 +12,7 @@ PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel" BOOTSTRAP_EXTRA_RDEPENDS += "uboot-${MACHINE} ${MACHINE}-kernel" -include conf/machine/include/tune-xscale.conf +require conf/machine/include/tune-xscale.conf # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttyS0" diff --git a/conf/machine/dht-walnut.conf b/conf/machine/dht-walnut.conf index ffd114ace4..244a89a6b3 100644 --- a/conf/machine/dht-walnut.conf +++ b/conf/machine/dht-walnut.conf @@ -11,5 +11,5 @@ TARGET_CPU = "405" OLDEST_KERNEL = "2.6.9" #tune for the 405 cpu -include conf/machine/include/tune-ppc405.conf +require conf/machine/include/tune-ppc405.conf diff --git a/conf/machine/efika.conf b/conf/machine/efika.conf index 5b2c87b55c..7c277d3d73 100644 --- a/conf/machine/efika.conf +++ b/conf/machine/efika.conf @@ -14,4 +14,4 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}" USE_VT = "0" #tune for the MPC5200B cpu -include conf/machine/include/tune-ppc603e.conf +require conf/machine/include/tune-ppc603e.conf diff --git a/conf/machine/ep93xx.conf b/conf/machine/ep93xx.conf index 5e9917ffaf..0951056710 100644 --- a/conf/machine/ep93xx.conf +++ b/conf/machine/ep93xx.conf @@ -23,7 +23,7 @@ EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x40000 --pad=0x500000 " #tune for ep93xx cpus #can be used for crunch support later on -#include conf/machine/include/tune-ep9312.conf +#require conf/machine/include/tune-ep9312.conf -include conf/machine/include/tune-arm920t.conf +require conf/machine/include/tune-arm920t.conf diff --git a/conf/machine/epia.conf b/conf/machine/epia.conf index 08f12a0ac6..189021747a 100644 --- a/conf/machine/epia.conf +++ b/conf/machine/epia.conf @@ -9,5 +9,5 @@ GLIBC_ADDONS = "nptl" GLIBC_EXTRA_OECONF = "--with-tls" PACKAGE_EXTRA_ARCHS = "i386" -include conf/machine/include/tune-c3.conf +require conf/machine/include/tune-c3.conf diff --git a/conf/machine/gumstix.conf b/conf/machine/gumstix.conf index 0fccf05b3b..36ed04e67b 100644 --- a/conf/machine/gumstix.conf +++ b/conf/machine/gumstix.conf @@ -4,7 +4,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-gumstix" OLDEST_KERNEL = "2.6.15" MODUTILS = "26" -include conf/machine/include/tune-xscale.conf +require conf/machine/include/tune-xscale.conf TARGET_CC_ARCH = "-Os -pipe -Os -march=armv5te -mtune=xscale -Wa,-mcpu=xscale" PACKAGE_ARCH = "arm" diff --git a/conf/machine/h1940.conf b/conf/machine/h1940.conf index e105360b96..1a63643868 100644 --- a/conf/machine/h1940.conf +++ b/conf/machine/h1940.conf @@ -21,5 +21,5 @@ SERIAL_CONSOLE = "115200 ttySAC2 vt100" USE_VT = "0" # tune for armv4t -include conf/machine/include/tune-arm920t.conf +require conf/machine/include/tune-arm920t.conf diff --git a/conf/machine/ixp4xx.conf b/conf/machine/ixp4xx.conf index 6d7fd11a05..f955215f31 100644 --- a/conf/machine/ixp4xx.conf +++ b/conf/machine/ixp4xx.conf @@ -4,7 +4,7 @@ MACHINE_FEATURES = "kernel26 usbhost ext2" -include conf/machine/include/ixp4xx.conf +require conf/machine/include/ixp4xx.conf PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ixp4xx${ARCH_BYTE_SEX}" diff --git a/conf/machine/ixp4xxbe.conf b/conf/machine/ixp4xxbe.conf index 700f7995fb..f303454cbb 100644 --- a/conf/machine/ixp4xxbe.conf +++ b/conf/machine/ixp4xxbe.conf @@ -5,7 +5,7 @@ MACHINE_FEATURES = "kernel26 usbhost ext2" ARCH_BYTE_SEX = "be" -include conf/machine/include/ixp4xx.conf +require conf/machine/include/ixp4xx.conf PACKAGE_EXTRA_ARCHS = "armv4eb armv4teb armv5eb armv5teb ixp4xxeb" diff --git a/conf/machine/jornada56x.conf b/conf/machine/jornada56x.conf index d6b3c70454..385af0864a 100644 --- a/conf/machine/jornada56x.conf +++ b/conf/machine/jornada56x.conf @@ -12,4 +12,4 @@ EXTRA_IMAGECMD_jornada56x_jffs2 = "-e 0x40000 -p" SERIAL_CONSOLE = "115200 ttySA0" -include conf/machine/include/tune-strongarm.conf +require conf/machine/include/tune-strongarm.conf diff --git a/conf/machine/jornada6xx.conf b/conf/machine/jornada6xx.conf index aa6631a524..a12328b993 100644 --- a/conf/machine/jornada6xx.conf +++ b/conf/machine/jornada6xx.conf @@ -4,7 +4,7 @@ TARGET_ARCH = "sh3" -include conf/machine/include/tune-sh3.conf +require conf/machine/include/tune-sh3.conf PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-jornada6xx" PCMCIA_MANAGER = "pcmciautils" diff --git a/conf/machine/jornada7xx.conf b/conf/machine/jornada7xx.conf index 811ea6a3e8..74a94bdfcf 100644 --- a/conf/machine/jornada7xx.conf +++ b/conf/machine/jornada7xx.conf @@ -4,7 +4,7 @@ TARGET_ARCH = "arm" -include conf/machine/include/tune-strongarm.conf +require conf/machine/include/tune-strongarm.conf PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-jornada7xx" PCMCIA_MANAGER = "pcmciautils" diff --git a/conf/machine/lite5200.conf b/conf/machine/lite5200.conf index 3cbc44485d..f47e773717 100644 --- a/conf/machine/lite5200.conf +++ b/conf/machine/lite5200.conf @@ -8,4 +8,4 @@ TARGET_PREFIX = "powerpc-603e-linux-gnu-" IMAGE_FSTYPES = "jffs2 tar.bz2" -include conf/machine/include/tune-ppc603e.conf +require conf/machine/include/tune-ppc603e.conf diff --git a/conf/machine/logicpd-pxa270.conf b/conf/machine/logicpd-pxa270.conf index 8fd58bb5ed..dacee830b7 100644 --- a/conf/machine/logicpd-pxa270.conf +++ b/conf/machine/logicpd-pxa270.conf @@ -9,7 +9,7 @@ GUI_MACHINE_CLASS = "smallscreen" PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}" PACKAGE_EXTRA_ARCHS = "armv4 armv5te" -include conf/machine/include/tune-xscale.conf +require conf/machine/include/tune-xscale.conf # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttyS0" diff --git a/conf/machine/mainstone.conf b/conf/machine/mainstone.conf index 914022c7bc..6303a8e96a 100644 --- a/conf/machine/mainstone.conf +++ b/conf/machine/mainstone.conf @@ -9,7 +9,7 @@ PACKAGE_EXTRA_ARCHS = "armv5te" PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel" -include conf/machine/include/tune-xscale.conf +require conf/machine/include/tune-xscale.conf # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttyS0" diff --git a/conf/machine/mx21ads.conf b/conf/machine/mx21ads.conf index 77961714eb..160b9fd207 100644 --- a/conf/machine/mx21ads.conf +++ b/conf/machine/mx21ads.conf @@ -11,7 +11,7 @@ PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te" PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel" -include conf/machine/include/tune-arm926ejs.conf +require conf/machine/include/tune-arm926ejs.conf # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttymxc0" diff --git a/conf/machine/mx31ads.conf b/conf/machine/mx31ads.conf index 33456a4b03..07976f7dbd 100644 --- a/conf/machine/mx31ads.conf +++ b/conf/machine/mx31ads.conf @@ -12,7 +12,7 @@ PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te armv6" PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel" -include conf/machine/include/tune-arm1136jf-s.conf +require conf/machine/include/tune-arm1136jf-s.conf # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttymxc0" diff --git a/conf/machine/netbook-pro.conf b/conf/machine/netbook-pro.conf index f83de23786..3baf1c2878 100755 --- a/conf/machine/netbook-pro.conf +++ b/conf/machine/netbook-pro.conf @@ -31,4 +31,4 @@ GUI_MACHINE_CLASS = "bigscreen" #The initrd needs /initrd present to be able to do pivot_root ROOTFS_POSTPROCESS_COMMAND += " mkdir -p ${IMAGE_ROOTFS}/initrd; " -include conf/machine/include/tune-xscale.conf +require conf/machine/include/tune-xscale.conf diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf index de53f3c3bc..f7e05e768b 100644 --- a/conf/machine/nokia770.conf +++ b/conf/machine/nokia770.conf @@ -14,7 +14,7 @@ XSERVER = "xserver-kdrive-omap" GUI_MACHINE_CLASS = "bigscreen" # Use tune-arm926 per default. Machine independent feeds should be built with tune-strongarm. -include conf/machine/include/tune-arm926ejs.conf +require conf/machine/include/tune-arm926ejs.conf #size of the root partition (yes, it is 123 MB) ROOT_FLASH_SIZE = "123" diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf index b00f8a520c..304018baea 100644 --- a/conf/machine/nslu2.conf +++ b/conf/machine/nslu2.conf @@ -2,4 +2,4 @@ #@NAME: Linksys NSLU2 #@DESCRIPTION: Machine configuration for the Linksys NSLU2 product -include conf/machine/include/ixp4xx.conf +require conf/machine/include/ixp4xx.conf diff --git a/conf/machine/omap1510inn.conf b/conf/machine/omap1510inn.conf index 51d5b12f9d..0b26436bf5 100644 --- a/conf/machine/omap1510inn.conf +++ b/conf/machine/omap1510inn.conf @@ -14,4 +14,4 @@ BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral" SERIAL_CONSOLE ?= "115200 ttyS0" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" -include conf/machine/include/tune-arm926ejs.conf +require conf/machine/include/tune-arm926ejs.conf diff --git a/conf/machine/omap1610h2.conf b/conf/machine/omap1610h2.conf index 51d5b12f9d..0b26436bf5 100644 --- a/conf/machine/omap1610h2.conf +++ b/conf/machine/omap1610h2.conf @@ -14,4 +14,4 @@ BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral" SERIAL_CONSOLE ?= "115200 ttyS0" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" -include conf/machine/include/tune-arm926ejs.conf +require conf/machine/include/tune-arm926ejs.conf diff --git a/conf/machine/omap1710h3.conf b/conf/machine/omap1710h3.conf index 51d5b12f9d..0b26436bf5 100644 --- a/conf/machine/omap1710h3.conf +++ b/conf/machine/omap1710h3.conf @@ -14,4 +14,4 @@ BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral" SERIAL_CONSOLE ?= "115200 ttyS0" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" -include conf/machine/include/tune-arm926ejs.conf +require conf/machine/include/tune-arm926ejs.conf diff --git a/conf/machine/omap2420h4.conf b/conf/machine/omap2420h4.conf index 70a3082956..a9e1a00cc5 100644 --- a/conf/machine/omap2420h4.conf +++ b/conf/machine/omap2420h4.conf @@ -14,4 +14,4 @@ BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral" SERIAL_CONSOLE ?= "115200 ttyS0" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" -include conf/machine/include/tune-arm926ejs.conf +require conf/machine/include/tune-arm926ejs.conf diff --git a/conf/machine/omap5912osk.conf b/conf/machine/omap5912osk.conf index 6e704a1f4e..8369789f1b 100644 --- a/conf/machine/omap5912osk.conf +++ b/conf/machine/omap5912osk.conf @@ -28,7 +28,7 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-module-ide-cs \ kernel-module-nls-base \ kernel-module-vfat" -include conf/machine/include/tune-arm926ejs.conf +require conf/machine/include/tune-arm926ejs.conf # old modules setup - partially need to be added into MACHINE_EXTRA_RRECOMMENDS diff --git a/conf/machine/palmld.conf b/conf/machine/palmld.conf index ae858ef2f8..ba67f473b2 100644 --- a/conf/machine/palmld.conf +++ b/conf/machine/palmld.conf @@ -18,6 +18,6 @@ SERIAL_CONSOLE = "115200 ttyS0" GUI_MACHINE_CLASS = "bigscreen" # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. -include conf/machine/tune-xscale.conf +require conf/machine/include/tune-xscale.conf module_autoload_sa1100-rtc = "sa1100-rtc" diff --git a/conf/machine/palmtx.conf b/conf/machine/palmtx.conf index 0c2b08ba9a..0a58defa69 100644 --- a/conf/machine/palmtx.conf +++ b/conf/machine/palmtx.conf @@ -18,6 +18,6 @@ SERIAL_CONSOLE = "115200 ttyS0" GUI_MACHINE_CLASS = "bigscreen" # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. -include conf/machine/tune-xscale.conf +require conf/machine/include/tune-xscale.conf module_autoload_sa1100-rtc = "sa1100-rtc" diff --git a/conf/machine/rx3000.conf b/conf/machine/rx3000.conf index c0324c887d..40b13667b6 100644 --- a/conf/machine/rx3000.conf +++ b/conf/machine/rx3000.conf @@ -9,7 +9,7 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4 armv4t" # Samsung S3C2xxx CPU -include conf/machine/include/tune-arm920t.conf +require conf/machine/include/tune-arm920t.conf ROOT_FLASH_SIZE = "32" VOLATILE_STORAGE_SIZE = "64" diff --git a/conf/machine/smdk2440.conf b/conf/machine/smdk2440.conf index 6a8deb9176..f2064175fd 100644 --- a/conf/machine/smdk2440.conf +++ b/conf/machine/smdk2440.conf @@ -16,4 +16,4 @@ IMAGE_FSTYPES = "tar.gz" MACHINE_TASK_PROVIDER = "task-base" MACHINE_FEATURES = "kernel26 apm screen" -include conf/machine/include/tune-arm920t.conf +require conf/machine/include/tune-arm920t.conf diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf index 455ae56677..84c340f66e 100644 --- a/conf/machine/spitz.conf +++ b/conf/machine/spitz.conf @@ -2,8 +2,8 @@ #@NAME: Sharp Zaurus SL-C3000 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C3000 device -include conf/machine/include/zaurus-2.6.conf -include conf/machine/include/zaurus-clamshell.conf +require conf/machine/include/zaurus-2.6.conf +require conf/machine/include/zaurus-clamshell.conf PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}" diff --git a/conf/machine/storcenter.conf b/conf/machine/storcenter.conf index a36684b758..511d200deb 100644 --- a/conf/machine/storcenter.conf +++ b/conf/machine/storcenter.conf @@ -14,4 +14,4 @@ MACHINE_FEATURES= "kernel26 usbhost" BOOTSTRAP_EXTRA_RDEPENDS = "mdadm" PREFERRED_PROVIDER_virtual/kernel = "linux-storcenter" -include conf/machine/include/tune-ppc603e.conf +require conf/machine/include/tune-ppc603e.conf diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf index e893cf8ed0..e9ab7dd34a 100644 --- a/conf/machine/tosa.conf +++ b/conf/machine/tosa.conf @@ -2,7 +2,7 @@ #@NAME: Sharp Zaurus SL-6000 #@DESCRIPTION: Machine configuration for the PXA255 based Sharp Zaurus SL-6000 device -include conf/machine/include/zaurus-2.6.conf +require conf/machine/include/zaurus-2.6.conf # wlan-ng Modules MACHINE_EXTRA_RRECOMMENDS += "wlan-ng-modules-usb" diff --git a/conf/machine/triton.conf b/conf/machine/triton.conf index 685dcd91fb..d79c23e4ac 100644 --- a/conf/machine/triton.conf +++ b/conf/machine/triton.conf @@ -14,5 +14,5 @@ SERIAL_CONSOLE = "38400 ttyS0" KERNEL_CONSOLE = "ttys0,38400" USE_VT = "0" -include conf/machine/include/tune-xscale.conf +require conf/machine/include/tune-xscale.conf diff --git a/conf/machine/x86-uml.conf b/conf/machine/x86-uml.conf index 34a6b89ab5..e90333836e 100644 --- a/conf/machine/x86-uml.conf +++ b/conf/machine/x86-uml.conf @@ -2,7 +2,7 @@ #@NAME: X86 User Mode Linux #@DESCRIPTION: Machine configuration for a User Mode Linux running on an x86 compatible PC -include conf/machine/x86.conf +require conf/machine/x86.conf PREFERRED_PROVIDER_virtual/kernel = "linux-uml" diff --git a/packages/cvs/cvs_1.12.8.bb b/packages/cvs/cvs_1.12.8.bb index 51aa9de2fb..b472a451eb 100644 --- a/packages/cvs/cvs_1.12.8.bb +++ b/packages/cvs/cvs_1.12.8.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" DEPENDS = "" LICENSE = "GPL" -SRC_URI = "https://cvs.cvshome.org/files/documents/19/170/cvs-${PV}.tar.bz2 \ +SRC_URI = "http://musthave.sunbase.org/progs/ccvs/Old/cvs-${PV}/cvs-${PV}.tar.bz2 \ file://m4.patch;patch=1" inherit autotools gettext diff --git a/packages/ifupdown/ifupdown-0.6.4/gcc34-fix.patch b/packages/ifupdown/ifupdown-0.6.4/gcc34-fix.patch deleted file mode 100644 index f90e312694..0000000000 --- a/packages/ifupdown/ifupdown-0.6.4/gcc34-fix.patch +++ /dev/null @@ -1,16 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- ifupdown-0.6.4/execute.c~gcc34-fix 2004-04-28 00:16:45.000000000 +0200 -+++ ifupdown-0.6.4/execute.c 2004-04-28 00:17:11.000000000 +0200 -@@ -167,7 +167,7 @@ - case 0: /* child */ - execle("/bin/sh", "/bin/sh", "-c", str, NULL, environ); - exit(127); -- default: /* parent */ -+ default:; /* parent */ - } - waitpid(child, &status, 0); - if (!WIFEXITED(status) || WEXITSTATUS(status) != 0)
\ No newline at end of file diff --git a/packages/ifupdown/ifupdown-0.6.4/.mtn2git_empty b/packages/ifupdown/ifupdown-0.6.8/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/ifupdown/ifupdown-0.6.4/.mtn2git_empty +++ b/packages/ifupdown/ifupdown-0.6.8/.mtn2git_empty diff --git a/packages/ifupdown/ifupdown-0.6.4/busybox.patch b/packages/ifupdown/ifupdown-0.6.8/busybox.patch index 5619ab7c0a..5619ab7c0a 100644 --- a/packages/ifupdown/ifupdown-0.6.4/busybox.patch +++ b/packages/ifupdown/ifupdown-0.6.8/busybox.patch diff --git a/packages/ifupdown/ifupdown-0.6.4/head-tail.patch b/packages/ifupdown/ifupdown-0.6.8/head-tail.patch index a86a25d2fb..a86a25d2fb 100644 --- a/packages/ifupdown/ifupdown-0.6.4/head-tail.patch +++ b/packages/ifupdown/ifupdown-0.6.8/head-tail.patch diff --git a/packages/ifupdown/ifupdown-0.6.4/init b/packages/ifupdown/ifupdown-0.6.8/init index d258d51ff4..d258d51ff4 100644 --- a/packages/ifupdown/ifupdown-0.6.4/init +++ b/packages/ifupdown/ifupdown-0.6.8/init diff --git a/packages/ifupdown/ifupdown-0.6.4/interfaces b/packages/ifupdown/ifupdown-0.6.8/interfaces index f1bd92ed2b..f1bd92ed2b 100644 --- a/packages/ifupdown/ifupdown-0.6.4/interfaces +++ b/packages/ifupdown/ifupdown-0.6.8/interfaces diff --git a/packages/ifupdown/ifupdown-0.6.4/udhcpc.patch b/packages/ifupdown/ifupdown-0.6.8/udhcpc.patch index 39a6b3349d..5b662e7988 100644 --- a/packages/ifupdown/ifupdown-0.6.4/udhcpc.patch +++ b/packages/ifupdown/ifupdown-0.6.8/udhcpc.patch @@ -1,18 +1,20 @@ ---- ifupdown/inet.defn.orig 2004-04-29 20:16:07.000000000 +0200 -+++ ifupdown/inet.defn 2004-04-29 20:16:13.000000000 +0200 +Index: ifupdown-0.6.8/inet.defn +=================================================================== +--- ifupdown-0.6.8.orig/inet.defn 2007-01-04 09:11:43.000000000 +0100 ++++ ifupdown-0.6.8/inet.defn 2007-01-04 09:12:51.000000000 +0100 @@ -81,8 +81,7 @@ elsif (execable("/sbin/dhclient")) pump -i %iface% [[-h %hostname%]] [[-l %leasehours%]] \ elsif (execable("/sbin/pump") && mylinuxver() >= mylinux(2,1,100)) - udhcpc -n -p /var/run/udhcpc.%iface%.pid -i %iface% [[-H %hostname%]] \ -- [[-c %clientid%]] \ +- [[-c %client%]] \ + udhcpc -b -p /var/run/udhcpc.%iface%.pid -i %iface% -H `cat /etc/hostname` \ elsif (execable("/sbin/udhcpc") && mylinuxver() >= mylinux(2,2,0)) - dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %clientid%]] \ + dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %client%]] \ [[-l %leasetime%]] %iface% \ @@ -91,11 +90,11 @@ down - dhclient3 -r -pf /var/run/dhclient.%iface%.pid -lf /var/run/dhclient.%iface%.leases %iface% \ + dhclient3 -r -pf /var/run/dhclient.%iface%.pid -lf /var/lib/dhcp3/dhclient.%iface%.leases %iface% \ if (execable("/sbin/dhclient3")) - cat /var/run/dhclient.%iface%.pid | xargs -i kill -TERM {} \ + kill -TERM `cat /var/run/dhclient.%iface%.pid` \ @@ -23,4 +25,4 @@ + kill -TERM `cat /var/run/udhcpc.%iface%.pid` \ elsif (execable("/sbin/udhcpc")) dhcpcd -k %iface% \ - elsif (execable("/sbin/dhcpcd"))
\ No newline at end of file + elsif (execable("/sbin/dhcpcd")) diff --git a/packages/ifupdown/ifupdown-0.6.4/zeroconf.patch b/packages/ifupdown/ifupdown-0.6.8/zeroconf.patch index 33745db6ff..33745db6ff 100644 --- a/packages/ifupdown/ifupdown-0.6.4/zeroconf.patch +++ b/packages/ifupdown/ifupdown-0.6.8/zeroconf.patch diff --git a/packages/ifupdown/ifupdown_0.6.4.bb b/packages/ifupdown/ifupdown_0.6.8.bb index bf0c82634f..53ccb5fe6c 100644 --- a/packages/ifupdown/ifupdown_0.6.4.bb +++ b/packages/ifupdown/ifupdown_0.6.8.bb @@ -1,6 +1,3 @@ -BROKEN = "1" -# Debian moved to 0.6.7 - DESCRIPTION = "High level tools to configure network interfaces \ This package provides the tools ifup and ifdown which may be used to \ configure (or, respectively, deconfigure) network interfaces, based on \ @@ -9,12 +6,10 @@ LICENSE = "GPL" SECTION = "base" -SRC_URI = "${DEBIAN_MIRROR}/main/i/ifupdown/ifupdown_${PV}.orig.tar.gz \ - ${DEBIAN_MIRROR}/main/i/ifupdown/ifupdown_${PV}-4.8.diff.gz;patch=1 \ +SRC_URI = "${DEBIAN_MIRROR}/main/i/ifupdown/ifupdown_${PV}.tar.gz \ file://busybox.patch;patch=1 \ file://udhcpc.patch;patch=1 \ file://zeroconf.patch;patch=1 \ - file://gcc34-fix.patch;patch=1 \ file://init \ file://interfaces" @@ -28,9 +23,14 @@ do_compile () { do_install () { install -d ${D}${sysconfdir}/init.d \ ${D}${sysconfdir}/network \ + ${D}${mandir}/man8 \ + ${D}${mandir}/man5 \ ${D}${base_sbindir} install -m 0755 ifup ${D}${base_sbindir}/ ln ${D}${base_sbindir}/ifup ${D}${base_sbindir}/ifdown install -m 0644 ${WORKDIR}/init ${D}${sysconfdir}/init.d/networking install -m 0644 ${WORKDIR}/interfaces ${D}${sysconfdir}/network/interfaces + install -m 0644 ifup.8 ${D}${mandir}/man8 + install -m 0644 interfaces.5 ${D}${mandir}/man5 + cd ${D}${mandir}/man8 && ln -s ifup.8 ifdown.8 } diff --git a/packages/lftp/lftp_3.5.1.bb b/packages/lftp/lftp_3.5.1.bb index a45b75fe35..df184ae9ca 100644 --- a/packages/lftp/lftp_3.5.1.bb +++ b/packages/lftp/lftp_3.5.1.bb @@ -6,7 +6,7 @@ HOMEPAGE = "http://lftp.yar.ru" SECTION = "console/network" DEPENDS = "readline gnutls" -SRC_URI = "http://www.ibiblio.org/pub/Linux/system/network/file-transfer/lftp-3.5.1.tar.gz" +SRC_URI = "ftp://ftp.wiretapped.net/pub/mirrors/lftp/old/lftp-3.5.1.tar.bz2" EXTRA_OECONF = "--disable-largefile --disable-rpath --with-included-readline=no" diff --git a/packages/libnet/libnet_1.0.2a.bb b/packages/libnet/libnet_1.0.2a.bb index 6e6067cf8f..c4e4396e1a 100644 --- a/packages/libnet/libnet_1.0.2a.bb +++ b/packages/libnet/libnet_1.0.2a.bb @@ -9,11 +9,12 @@ PR = "r1" # There are major API changes beween libnet v1.0 and libnet v1.1 PROVIDES = "libnet-1.0" -SRC_URI = "http://www.packetfactory.net/libnet/dist/deprecated/libnet-${PV}.tar.gz \ +#SRC_URI = "http://www.packetfactory.net/libnet/dist/deprecated/libnet-${PV}.tar.gz \ +SRC_URI = "${DEBIAN_MIRROR}/main/libn/libnet0/libnet0_${PV}.orig.tar.gz \ file://configure.patch;patch=1 \ file://configure.uclibc.patch;patch=1 \ " -S = "${WORKDIR}/Libnet-${PV}" +S = "${WORKDIR}/libnet-${PV}.orig" inherit autotools diff --git a/packages/libnet/libnet_1.1.2.1.bb b/packages/libnet/libnet_1.1.2.1.bb index 92457a8ff4..f9464ae8bb 100644 --- a/packages/libnet/libnet_1.1.2.1.bb +++ b/packages/libnet/libnet_1.1.2.1.bb @@ -8,7 +8,7 @@ DEPENDS = "libpcap" PROVIDES = "libnet-1.1" PR = "r1" -SRC_URI = "http://www.packetfactory.net/libnet/dist/libnet-${PV}.tar.gz \ +SRC_URI = "${DEBIAN_MIRROR}/main/libn/libnet/libnet_${PV}.orig.tar.gz \ file://support-uclibc.patch;patch=1 \ file://fix-endianess-test.patch;patch=1" @@ -31,6 +31,7 @@ do_stage () { oe_runmake -C include/libnet 'DESTDIR=${STAGING_INCDIR}' 'includedir=' install-libnetincludeHEADERS } +#static build PACKAGES = "${PN}-dev ${PN}-doc" FILES_${PN}-dev += "${bindir}/libnet-config" diff --git a/packages/libxml/libxml2-native_2.6.9.bb b/packages/libxml/libxml2-native_2.6.9.bb index f83d974538..df3ab07460 100644 --- a/packages/libxml/libxml2-native_2.6.9.bb +++ b/packages/libxml/libxml2-native_2.6.9.bb @@ -1,6 +1,6 @@ DESCRIPTION = "GNOME XML library" -SRC_URI = "http://xmlsoft.org/sources/libxml2-${PV}.tar.gz" +SRC_URI = "ftp://xmlsoft.org/libxml2/old/libxml2-${PV}.tar.gz" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libxml2-${PV}" S = "${WORKDIR}/libxml2-${PV}" diff --git a/packages/linux/linux-hackndev-2.6_svn.bb b/packages/linux/linux-hackndev-2.6_svn.bb new file mode 100644 index 0000000000..32868b5570 --- /dev/null +++ b/packages/linux/linux-hackndev-2.6_svn.bb @@ -0,0 +1,78 @@ +DESCRIPTION = "Hack&Dev's Linux kernel for Palm devices." +HOMEPAGE = "http://www.hackndev.com/" +SECTION = "kernel" +LICENSE = "GPL" + +COMPATIBLE_MACHINE = "(palmtx|palmld)" + +SRC_URI = "svn://svn.sourceforge.net/svnroot/hackndev/linux4palm/linux;module=trunk;proto=https \ + file://defconfig" + +SRC_URI_append_palmtx += "http://www.busybox.net/downloads/busybox-1.1.0.tar.bz2 \ + file://init \ + file://initramfs_list \ + file://busybox-config" + +S = "${WORKDIR}/trunk" + +K_MAJOR = "2" +K_MINOR = "6" +K_MICRO = "17" +HHV="hnd0" +PV = "${K_MAJOR}.${K_MINOR}.${K_MICRO}-${HHV}" + +inherit kernel + +PACKAGE_ARCH_palmtx = "palmtx" +PACKAGE_ARCH_palmld = "palmld" +PACKAGE_ARCH_palmz72 = "palmz72" + +do_configure() { + + if [ -f ${WORKDIR}/defconfig ]; then + install -m 0644 ${WORKDIR}/defconfig ${S}/.config || die "No configuration for ${MACHINE} available." + else + install -m 0644 ${S}/arch/arm/configs/${MACHINE}_defconfig ${S}/.config \ + || die "No default configuration for ${MACHINE} available." + fi + + if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then + echo "CONFIG_AEABI=y" >> ${S}/.config + echo "CONFIG_OABI_COMPAT=y" >> ${S}/.config + else + echo "# CONFIG_AEABI is not set" >> ${S}/.config + echo "# CONFIG_OABI_COMPAT is not set" >> ${S}/.config + fi + + if [ -f ${WORKDIR}/initramfs_list ]; then + install -m 0644 ${WORKDIR}/busybox-config ${WORKDIR}/busybox-1.1.0/.config \ + || die "No busybox configuration available." + + echo "CROSS_COMPILER_PREFIX=\"${TARGET_PREFIX}\"" >> ${WORKDIR}/busybox-1.1.0/.config + echo "USING_CROSS_COMPILER=y" >> ${WORKDIR}/busybox-1.1.0/.config + + MY_UID=`id -u` + MY_GID=`id -g` + + echo "CONFIG_INITRAMFS_SOURCE=\"../initramfs_list\"" >> ${S}/.config + echo "CONFIG_INITRAMFS_ROOT_UID=${MY_UID}" >> ${S}/.config + echo "CONFIG_INITRAMFS_ROOT_GID=${MY_GID}" >> ${S}/.config + else + echo "CONFIG_INITRAMFS_SOURCE=\"\"" >> ${S}/.config + echo "CONFIG_INITRAMFS_ROOT_UID=0" >> ${S}/.config + echo "CONFIG_INITRAMFS_ROOT_GID=0" >> ${S}/.config + + fi + + yes '' | oe_runmake oldconfig + +} + + +do_compile_prepend() { + if [ -f ${WORKDIR}/initramfs_list ]; then + cd ${WORKDIR}/busybox-1.1.0 + oe_runmake 'CC=${CC}' 'CROSS=${HOST_PREFIX}' + cd - + fi +} diff --git a/packages/syslinux/syslinux-native_2.11.bb b/packages/syslinux/syslinux-native_2.11.bb index 3d0c5e5ad8..a05728f0a5 100644 --- a/packages/syslinux/syslinux-native_2.11.bb +++ b/packages/syslinux/syslinux-native_2.11.bb @@ -1,38 +1,10 @@ -# syslinux-native OE build file -# Copyright (C) 2004-2006, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -DESCRIPTION="A multi-purpose linux bootloader" -HOMEPAGE="http://syslinux.zytor.com/" -LICENSE="GPL" - PR="r1" SRC_URI="${KERNELORG_MIRROR}/pub/linux/utils/boot/syslinux/Old/syslinux-${PV}.tar.bz2 \ -file://edx_assume_zero.patch;patch=1" - -S="${WORKDIR}/syslinux-${PV}" - -# If you really want to run syslinux, you need mtools. We just want the -# ldlinux.* stuff for now, so skip mtools-native - -DEPENDS="nasm-native" + file://edx_assume_zero.patch;patch=1" -inherit native +require syslinux.inc do_compile() { oe_runmake syslinux } - -do_stage() { - install -d ${STAGING_BINDIR} - install -m 755 ${S}/syslinux ${STAGING_BINDIR} - - # When building media, the syslinux binary isn't nearly as useful - # as the DOS data files, so we copy those into a special location - # for usage during a image build stage - - install -d ${STAGING_DATADIR}/syslinux - install -m 644 ${S}/ldlinux.sys ${STAGING_DATADIR}/syslinux/ldlinux.sys - install -m 644 ${S}/ldlinux.bss ${STAGING_DATADIR}/syslinux/ldlinux.bss -} diff --git a/packages/syslinux/syslinux-native_3.11.bb b/packages/syslinux/syslinux-native_3.11.bb index 90395a7ab2..28d750aab5 100644 --- a/packages/syslinux/syslinux-native_3.11.bb +++ b/packages/syslinux/syslinux-native_3.11.bb @@ -1,39 +1,5 @@ -# syslinux-native OE build file -# Copyright (C) 2004-2006, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -DESCRIPTION="A multi-purpose linux bootloader" -HOMEPAGE="http://syslinux.zytor.com/" -LICENSE="GPL" - PR="r1" -SRC_URI="${KERNELORG_MIRROR}/pub/linux/utils/boot/syslinux/syslinux-${PV}.tar.bz2 " - -S="${WORKDIR}/syslinux-${PV}" - -# If you really want to run syslinux, you need mtools. We just want the -# ldlinux.* stuff for now, so skip mtools-native - -DEPENDS="nasm-native" - -inherit native - -STAGE_TEMP="${WORKDIR}/stage_temp" - -do_stage() { - install -d ${STAGE_TEMP} - oe_runmake install INSTALLROOT="${STAGE_TEMP}" - - install -d ${STAGING_BINDIR} - install -m 755 ${STAGE_TEMP}/usr/bin/syslinux ${STAGING_BINDIR} - - # When building media, the syslinux binary isn't nearly as useful - # as the DOS data files, so we copy those into a special location - # for usage during a image build stage +SRC_URI="${KERNELORG_MIRROR}/pub/linux/utils/boot/syslinux/Old/syslinux-${PV}.tar.bz2 " - install -d ${STAGING_DATADIR}/syslinux - install -m 0644 ${STAGE_TEMP}/usr/lib/syslinux/isolinux.bin ${STAGING_DATADIR}/syslinux/isolinux.bin - install -m 644 ${S}/ldlinux.sys ${STAGING_DATADIR}/syslinux/ldlinux.sys - install -m 644 ${S}/ldlinux.bss ${STAGING_DATADIR}/syslinux/ldlinux.bss -} +require syslinux3.inc diff --git a/packages/syslinux/syslinux-native_3.31.bb b/packages/syslinux/syslinux-native_3.31.bb new file mode 100644 index 0000000000..6971874ea3 --- /dev/null +++ b/packages/syslinux/syslinux-native_3.31.bb @@ -0,0 +1,3 @@ +SRC_URI="${KERNELORG_MIRROR}/pub/linux/utils/boot/syslinux/syslinux-${PV}.tar.bz2 " + +require syslinux3.inc diff --git a/packages/syslinux/syslinux.inc b/packages/syslinux/syslinux.inc new file mode 100644 index 0000000000..41be168d12 --- /dev/null +++ b/packages/syslinux/syslinux.inc @@ -0,0 +1,29 @@ +# syslinux-native OE build file +# Copyright (C) 2004-2006, Advanced Micro Devices, Inc. All Rights Reserved +# Released under the MIT license (see packages/COPYING) + +DESCRIPTION="A multi-purpose linux bootloader" +HOMEPAGE="http://syslinux.zytor.com/" +LICENSE="GPL" + +# If you really want to run syslinux, you need mtools. We just want the +# ldlinux.* stuff for now, so skip mtools-native +DEPENDS="nasm-native" + +S="${WORKDIR}/syslinux-${PV}" + + +inherit native + +do_stage() { + install -d ${STAGING_BINDIR} + install -m 755 ${S}/syslinux ${STAGING_BINDIR} + + # When building media, the syslinux binary isn't nearly as useful + # as the DOS data files, so we copy those into a special location + # for usage during a image build stage + + install -d ${STAGING_DATADIR}/syslinux + install -m 644 ${S}/ldlinux.sys ${STAGING_DATADIR}/syslinux/ldlinux.sys + install -m 644 ${S}/ldlinux.bss ${STAGING_DATADIR}/syslinux/ldlinux.bss +} diff --git a/packages/syslinux/syslinux3.inc b/packages/syslinux/syslinux3.inc new file mode 100644 index 0000000000..25942aab84 --- /dev/null +++ b/packages/syslinux/syslinux3.inc @@ -0,0 +1,20 @@ +require syslinux.inc + +STAGE_TEMP="${WORKDIR}/stage_temp" + +do_stage() { + install -d ${STAGE_TEMP} + oe_runmake install INSTALLROOT="${STAGE_TEMP}" + + install -d ${STAGING_BINDIR} + install -m 755 ${STAGE_TEMP}/usr/bin/syslinux ${STAGING_BINDIR} + + # When building media, the syslinux binary isn't nearly as useful + # as the DOS data files, so we copy those into a special location + # for usage during a image build stage + + install -d ${STAGING_DATADIR}/syslinux + install -m 0644 ${STAGE_TEMP}/usr/lib/syslinux/isolinux.bin ${STAGING_DATADIR}/syslinux/isolinux.bin + install -m 644 ${S}/ldlinux.sys ${STAGING_DATADIR}/syslinux/ldlinux.sys + install -m 644 ${S}/ldlinux.bss ${STAGING_DATADIR}/syslinux/ldlinux.bss +} diff --git a/packages/tin/files/configure.patch b/packages/tin/files/configure.patch deleted file mode 100644 index 4059fe086f..0000000000 --- a/packages/tin/files/configure.patch +++ /dev/null @@ -1,205 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- tin-1.7.3/configure.in~configure -+++ tin-1.7.3/configure.in -@@ -34,8 +34,9 @@ - dnl - dnl Process this file with autoconf to produce a configure script. - --AC_PREREQ(2.13.20020210) --AC_INIT(include/tin.h) -+AC_PREREQ(2.57) -+AC_INIT -+AC_CONFIG_SRCDIR([include/tin.h]) - AC_CONFIG_HEADER(include/autoconf.h:include/autoconf.hin) - AC_PREFIX_DEFAULT(/usr/local) - -@@ -406,7 +407,7 @@ - CF_NCURSES_LIBS(ncursesw) - CF_NCURSES_VERSION - CF_XOPEN_CURSES -- test "$cf_cv_need_xopen_extension" = unknown && AC_ERROR(X/Open curses not found) -+ test "$cf_cv_need_xopen_extension" = unknown && AC_MSG_ERROR([X/Open curses not found]) - ;; - curses) #(vi - CF_CURSES_CPPFLAGS -@@ -432,25 +433,25 @@ - fi - - ## debugging libraries (do this after other libraries) --AC_MSG_CHECKING(if you want dbmalloc library) -+AC_MSG_CHECKING([if you want dbmalloc library]) - debug_malloc=none --AC_ARG_WITH(dbmalloc, -+AC_ARG_WITH([dbmalloc], - [ --with-dbmalloc use Conor Cahill's dbmalloc library], -- [AC_MSG_RESULT(yes) -- AC_CHECK_LIB(dbmalloc,debug_malloc, -- AC_CHECK_HEADER(dbmalloc.h,debug_malloc=DBMALLOC))], -- AC_MSG_RESULT(no)) -+ [AC_MSG_RESULT([yes]) -+ AC_CHECK_LIB([dbmalloc],[debug_malloc],[ -+ AC_CHECK_HEADER([dbmalloc.h],[debug_malloc=DBMALLOC])])], -+ AC_MSG_RESULT([no])) - --AC_MSG_CHECKING(if you want dmalloc library) --AC_ARG_WITH(dmalloc, -+AC_MSG_CHECKING([if you want dmalloc library]) -+AC_ARG_WITH([dmalloc], - [ --with-dmalloc use Gray Watson's dmalloc library], - [AC_MSG_RESULT(yes) -- AC_CHECK_LIB(dmalloc,dmalloc_debug, -- AC_CHECK_HEADER(dmalloc.h,debug_malloc=DMALLOC))], -+ AC_CHECK_LIB([dmalloc],[dmalloc_debug],[ -+ AC_CHECK_HEADER([dmalloc.h],[debug_malloc=DMALLOC])])], - AC_MSG_RESULT(no)) - --AC_MSG_CHECKING(if you want debugging-trace) --AC_ARG_WITH(trace, -+AC_MSG_CHECKING([if you want debugging-trace]) -+AC_ARG_WITH([trace], - [ --with-trace use debugging/traces], - [use_trace=yes], - [use_trace=no]) -@@ -667,7 +668,7 @@ - - ### checks for compiler characteristics - CF_MAKEFLAGS --AC_LANG_C -+AC_LANG([C]) - AC_C_CONST - AC_C_INLINE - CF_CPP_EXPANDS -@@ -763,14 +764,13 @@ - - dnl test to see if quad_t is defined - AC_MSG_CHECKING(for quad_t) --AC_TRY_COMPILE([ -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include <sys/types.h> - #if 0 - #include <stdlib.h> - #include <stddef.h> - #endif /* 0 */ --],[quad_t x; x = 0], --ac_cv_quad_t=yes, ac_cv_quad_t=no) -+]], [[quad_t x; x = 0]])],[ac_cv_quad_t=yes],[ac_cv_quad_t=no]) - AC_MSG_RESULT($ac_cv_quad_t) - if test $ac_cv_quad_t = yes; then - AC_DEFINE(HAVE_QUAD_T) -@@ -778,10 +778,9 @@ - - dnl test to see if long long is defined - AC_MSG_CHECKING(for long long) --AC_TRY_COMPILE([ -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include <sys/types.h> --],[long long x; x = 0], --ac_cv_long_long=yes, ac_cv_long_long=no) -+]], [[long long x; x = 0]])],[ac_cv_long_long=yes],[ac_cv_long_long=no]) - AC_MSG_RESULT($ac_cv_long_long) - if test $ac_cv_long_long = yes; then - AC_DEFINE(HAVE_LONG_LONG) -@@ -789,7 +788,7 @@ - - dnl test to see if nl_item is defined - AC_MSG_CHECKING(for nl_item) --AC_TRY_COMPILE([ -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #ifdef HAVE_LANGINFO_H - #include <langinfo.h> - #else -@@ -797,8 +796,7 @@ - #include <nl_types.h> - #endif - #endif --],[nl_item x; x = 0], --ac_cv_nl_item=yes, ac_cv_nl_item=no) -+]], [[nl_item x; x = 0]])],[ac_cv_nl_item=yes],[ac_cv_nl_item=no]) - AC_MSG_RESULT($ac_cv_nl_item) - if test $ac_cv_nl_item = yes; then - AC_DEFINE(HAVE_NL_ITEM) -@@ -845,14 +843,13 @@ - cf_save_LIBS="$LIBS" - cf_try_icuuc="no" - LIBS="$LIBS -licuuc" -- AC_TRY_LINK([#include <unicode/unorm.h>], [ -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <unicode/unorm.h>]], [[ - int32_t needed, ustr = NULL; - UErrorCode status; -- needed = unorm_normalize(ustr, -1, UNORM_DEFAULT, 0, NULL, 0, &status);], [ -+ needed = unorm_normalize(ustr, -1, UNORM_DEFAULT, 0, NULL, 0, &status);]])],[ - AC_DEFINE(HAVE_LIBICUUC) -- cf_try_icuuc="yes"], -- LIBS=$cf_save_LIBS -- ) -+ cf_try_icuuc="yes"],[LIBS=$cf_save_LIBS -+ ]) - AC_MSG_RESULT($cf_try_icuuc) - ]) - ]) -@@ -866,15 +863,13 @@ - AC_MSG_CHECKING(if we should include termcap.h) - cf_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -I$srcdir/include" -- AC_TRY_COMPILE([ -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #define HAVE_TERMCAP_H 1 --#include <tcurses.h>],[ -+#include <tcurses.h>]], [[ - #ifdef NCURSES_VERSION - make an error - #endif --], -- [cf_result=yes], -- [cf_result=no]) -+]])],[cf_result=yes],[cf_result=no]) - AC_MSG_RESULT($cf_result) - CFLAGS="$cf_save_CFLAGS" - test $cf_result = yes && AC_DEFINE(HAVE_TERMCAP_H) -@@ -889,8 +884,7 @@ - cf_tc_externs="$cf_tc_funcs tgoto tigetstr tputs tigetflag" - elif test ".$cf_cv_termlib" = .termcap ; then - # BSD 'tputs()' may need 'PC' to be set. -- AC_TRY_LINK([],[extern char PC; PC = 0], -- [AC_DEFINE(HAVE_EXTERN_TCAP_PC)]) -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[extern char PC; PC = 0]])],[AC_DEFINE(HAVE_EXTERN_TCAP_PC)],[]) - cf_tc_funcs="tgetint tgetnum tparam tparm" - cf_tc_externs="$cf_tc_funcs tgoto tgetstr tputs tgetent tgetflag" - fi -@@ -1172,7 +1166,7 @@ - - CF_CHECK_HEADERS(iconv.h) - AC_MSG_CHECKING(for iconv_open() //TRANSLIT extension) --AC_TRY_RUN([ -+AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #ifdef HAVE_ICONV_H - # include <iconv.h> - #endif /* HAVE_ICONV_H */ -@@ -1185,11 +1179,8 @@ - if ((cd = iconv_open("US-ASCII//TRANSLIT", "ISO-8859-1")) == (iconv_t) (-1)) - exit(1); - exit(0); --}], -- AC_DEFINE(HAVE_ICONV_OPEN_TRANSLIT) AC_MSG_RESULT(yes), -- AC_MSG_RESULT(no), -- AC_MSG_RESULT(unknown) --) -+}]])],[AC_DEFINE(HAVE_ICONV_OPEN_TRANSLIT) AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)],[AC_MSG_RESULT(unknown) -+]) - - - # tin has mkdirs.sh instead of mkinstalldirs, overwrite the result of test -@@ -1223,6 +1214,7 @@ - CF_DEFINE_STRING(TIN_LDFLAGS, "$LDFLAGS") - CF_DEFINE_STRING(TIN_LIBS, "$LIBS") - --AC_OUTPUT($PCRE_MAKEFILE -+AC_CONFIG_FILES([$PCRE_MAKEFILE - $SUB_MAKEFILE -- src/Makefile) -+ src/Makefile]) -+AC_OUTPUT diff --git a/packages/tin/files/makecfg-buildcc.patch b/packages/tin/files/makecfg-buildcc.patch deleted file mode 100644 index 2b3dba44f9..0000000000 --- a/packages/tin/files/makecfg-buildcc.patch +++ /dev/null @@ -1,24 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- tin-1.7.3/src/Makefile.in~makecfg-buildcc -+++ tin-1.7.3/src/Makefile.in -@@ -462,7 +462,7 @@ - ./makecfg $(SRCDIR)/tincfg.tbl tincfg.h - - makecfg$(EXEEXT): $(OBJDIR)/makecfg.o -- $(LD) $(LDFLAGS) -o $@ $(OBJDIR)/makecfg.o @LIBS@ -+ $(BUILD_CC) $(BUILD_LDFLAGS) -o $@ $(OBJDIR)/makecfg.o - - $(OBJDIR)/active.o: $(SRCDIR)/active.c $(TIN_DEP) - $(OBJDIR)/art.o: $(SRCDIR)/art.c $(TIN_DEP) \ -@@ -519,6 +519,7 @@ - $(OBJDIR)/main.o: $(SRCDIR)/main.c $(TIN_DEP) \ - $(INCDIR)/version.h - $(OBJDIR)/makecfg.o: $(SRCDIR)/makecfg.c $(TIN_DEP) -+ $(BUILD_CC) $(BUILD_CFLAGS) -c -I../include -I../pcre -o $@ $(SRCDIR)/makecfg.c - $(OBJDIR)/memory.o: $(SRCDIR)/memory.c $(TIN_DEP) \ - $(INCDIR)/rfc2046.h - $(OBJDIR)/mimetypes.o: $(SRCDIR)/mimetypes.c $(TIN_DEP) diff --git a/packages/tin/tin.inc b/packages/tin/tin.inc new file mode 100644 index 0000000000..e66fe8c67a --- /dev/null +++ b/packages/tin/tin.inc @@ -0,0 +1,8 @@ +DESCRIPTION = "Tin is a powerful text mode news reader." +SECTION = "console/network" +DEPENDS = "ncurses libpcre" +LICENSE = "GPL" + +inherit autotools + +EXTRA_OECONF = "--with-screen=ncurses --with-pcre=${STAGING_LIBDIR}/.." diff --git a/packages/tin/tin_1.7.3.bb b/packages/tin/tin_1.7.3.bb deleted file mode 100644 index 58726d7a27..0000000000 --- a/packages/tin/tin_1.7.3.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "Tin is a powerful text mode news reader." -SECTION = "console/network" -DEPENDS = "ncurses" -LICENSE = "GPL" -PR = "r3" - -SRC_URI = "ftp://ftp.tin.org/pub/news/clients/tin/unstable/tin-${PV}.tar.gz \ - file://makecfg-buildcc.patch;patch=1 \ - file://m4.patch;patch=1 \ - file://configure.patch;patch=1" - -inherit autotools - -EXTRA_OECONF = "--with-screen=ncurses" -CFLAGS += "-DM_UNIX" - -do_compile() { - ${BUILD_CC} -DLINK_SIZE=2 -I${S}/include -c pcre/dftables.c - ${BUILD_CC} dftables.o -o pcre/dftables - oe_runmake build -} diff --git a/packages/tin/tin_1.9.1.bb b/packages/tin/tin_1.9.1.bb index dcf53bd8b5..2b783b2a58 100644 --- a/packages/tin/tin_1.9.1.bb +++ b/packages/tin/tin_1.9.1.bb @@ -1,16 +1,11 @@ -DESCRIPTION = "Tin is a powerful text mode news reader." -SECTION = "console/network" -DEPENDS = "ncurses pcre" -LICENSE = "GPL" +require tin.inc + PR = "r0" -SRC_URI = "ftp://ftp.tin.org/pub/news/clients/tin/unstable/tin-${PV}.tar.gz \ +SRC_URI = "ftp://ftp.tin.org/pub/news/clients/tin/v1.9/tin-${PV}.tar.gz \ file://m4.patch;patch=1" -inherit autotools - PARALLEL_MAKE = "" -EXTRA_OECONF = "--with-screen=ncurses --with-pcre=${STAGING_LIBDIR}/.." export BUILD_CFLAGS += "-I${S}/include -DHAVE_CONFIG_H" diff --git a/packages/uboot/u-boot_git.bb b/packages/uboot/u-boot_git.bb new file mode 100644 index 0000000000..fa59bab085 --- /dev/null +++ b/packages/uboot/u-boot_git.bb @@ -0,0 +1,40 @@ +DESCRIPTION = "U-boot bootloader" +PROVIDES = "virtual/bootloader" +SECTION = "bootloader" +PRIORITY = "optional" +LICENSE = "GPL" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "git://www.denx.de/git/u-boot.git;protocol=git " + +S = "${WORKDIR}/git" + +#EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} CFLAGS="" CPPFLAGS="" LDFLAGS=""" +EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" + +UBOOT_MACHINE ?= "${MACHINE}_config" +UBOOT_IMAGE = "u-boot-${MACHINE}-${PV}-${PR}.bin" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +#inherit base + +do_compile () { + unset LDFLAGS + unset CFLAGS + unset CPPFLAGS + oe_runmake ${UBOOT_MACHINE} + oe_runmake all +} + +do_stage() { + install -m 755 tools/mkimage ${STAGING_BINDIR_NATIVE} +} + +do_deploy () { + install -d ${DEPLOY_DIR_IMAGE} + install ${S}/u-boot.bin ${DEPLOY_DIR_IMAGE}/${UBOOT_IMAGE} +} +do_deploy[dirs] = "${S}" +addtask deploy before do_build after do_compile diff --git a/packages/uboot/uboot-devkitidp-pxa255_cvs.bb b/packages/uboot/uboot-devkitidp-pxa255_cvs.bb index a41d5d7082..4e50706087 100644 --- a/packages/uboot/uboot-devkitidp-pxa255_cvs.bb +++ b/packages/uboot/uboot-devkitidp-pxa255_cvs.bb @@ -1,4 +1,37 @@ -require uboot_cvs.bb +BROKEN = "1" +#not fetchable patch used +DESCRIPTION = "U-boot bootloader" +SECTION = "bootloader" +PRIORITY = "optional" +LICENSE = "GPL" +SRCDATE = "20050818" +PV = "0.0+cvs${SRCDATE}" +PR = "r3" + +PROVIDES = "virtual/bootloader" + +S = "${WORKDIR}/u-boot" + +SRC_URI = "cvs://anonymous@u-boot.cvs.sourceforge.net/cvsroot/u-boot;module=u-boot \ + file://arm_flags.patch;patch=1 \ + ftp://ftp.accelent.com/pxa255_idp/uboot/u-boot-1.1.2-cvs20050818-r2-pxa255idp1.patch;patch=1" + +EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" +TARGET_LDFLAGS = "" UBOOT_MACHINE = "pxa255_idp_config" -SRC_URI += "ftp://ftp.accelent.com/pxa255_idp/uboot/u-boot-1.1.2-cvs20050818-r2-pxa255idp1.patch;patch=1" + +inherit base + +do_compile () { + oe_runmake ${UBOOT_MACHINE} + oe_runmake all +} + +do_deploy () { + install -d ${DEPLOY_DIR_IMAGE} + install ${S}/u-boot.bin ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}-${DATETIME}.bin +} +do_deploy[dirs] = "${S}" +addtask deploy before do_build after do_compile + diff --git a/packages/uboot/uboot_cvs.bb b/packages/uboot/uboot_cvs.bb deleted file mode 100644 index 617babcf4a..0000000000 --- a/packages/uboot/uboot_cvs.bb +++ /dev/null @@ -1,31 +0,0 @@ -DESCRIPTION = "U-boot bootloader" -SECTION = "bootloader" -PRIORITY = "optional" -LICENSE = "GPL" -PV = "0.0+cvs${SRCDATE}" -PR = "r2" - -PROVIDES = "virtual/bootloader" - -S = "${WORKDIR}/u-boot" - -SRC_URI = "cvs://anonymous@u-boot.cvs.sourceforge.net/cvsroot/u-boot;module=u-boot \ - file://arm_flags.patch;patch=1" - -EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" -TARGET_LDFLAGS = "" -UBOOT_MACHINE ?= "${MACHINE}" - -inherit base - -do_compile () { - oe_runmake ${UBOOT_MACHINE} - oe_runmake all -} - -do_deploy () { - install -d ${DEPLOY_DIR_IMAGE} - install ${S}/u-boot.bin ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}-${DATETIME}.bin -} -do_deploy[dirs] = "${S}" -addtask deploy before do_build after do_compile diff --git a/packages/zip/zip-native_2.31.bb b/packages/zip/zip-native_2.31.bb deleted file mode 100644 index fde61efcb7..0000000000 --- a/packages/zip/zip-native_2.31.bb +++ /dev/null @@ -1,9 +0,0 @@ -SECTION = "console/utils" -inherit native -require zip_${PV}.bb -S = "${WORKDIR}/zip-${PV}" - -do_stage() { - install -d ${STAGING_BINDIR} - install zip zipnote zipsplit zipcloak ${STAGING_BINDIR} -} diff --git a/packages/zip/zip_2.31.bb b/packages/zip/zip_2.31.bb deleted file mode 100644 index b8c4ae9da0..0000000000 --- a/packages/zip/zip_2.31.bb +++ /dev/null @@ -1,2 +0,0 @@ -require zip.inc -PR="r0" |