diff options
author | Rod Whitby <rod@whitby.id.au> | 2006-08-15 17:01:18 +0000 |
---|---|---|
committer | Rod Whitby <rod@whitby.id.au> | 2006-08-15 17:01:18 +0000 |
commit | f10f198bbff10f3c4cce027f69cdb059f8336f67 (patch) | |
tree | 6d24e2ddd0f1debe3c3f7eafa5a2a6ceda084f65 | |
parent | 975c8e4d5713a5bc618ba15738b8aa00671f106c (diff) | |
parent | 6ee8b19a4112772c356f4d4166d55d388b9d6e77 (diff) |
merge of e261185c5000481d6197a267c92dfb6a14888001
and f675128552d989bc13b142dbea3af60149c40241
-rw-r--r-- | packages/gcc/gcc-cross-initial_3.3.4.bb | 1 | ||||
-rw-r--r-- | packages/keymaps/keymaps_1.0.bb | 6 | ||||
-rw-r--r-- | packages/mysql/mysql_4.1.18.bb | 2 | ||||
-rw-r--r-- | packages/xorg-app/xterm_207.bb | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/packages/gcc/gcc-cross-initial_3.3.4.bb b/packages/gcc/gcc-cross-initial_3.3.4.bb index c650e4fe57..4fccaf3888 100644 --- a/packages/gcc/gcc-cross-initial_3.3.4.bb +++ b/packages/gcc/gcc-cross-initial_3.3.4.bb @@ -4,6 +4,7 @@ require gcc-cross_${PV}.bb DEPENDS = "virtual/${TARGET_PREFIX}binutils" DEPENDS += "${@['virtual/${TARGET_PREFIX}libc-initial',''][bb.data.getVar('TARGET_ARCH', d, 1) in ['arm', 'armeb', 'mips', 'mipsel']]}" PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial" +PACKAGES = "" # This is intended to be a -very- basic config EXTRA_OECONF = "--with-local-prefix=${CROSS_DIR}/${TARGET_SYS} \ diff --git a/packages/keymaps/keymaps_1.0.bb b/packages/keymaps/keymaps_1.0.bb index 8fa272124e..87edceffca 100644 --- a/packages/keymaps/keymaps_1.0.bb +++ b/packages/keymaps/keymaps_1.0.bb @@ -4,7 +4,7 @@ MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>" RDEPENDS = "initscripts console-tools" LICENSE = "GPL" PACKAGE_ARCH = "${MACHINE}" -PR = "r9" +PR = "r10" inherit update-rc.d @@ -17,7 +17,7 @@ SRC_URI_append_spitz = " file://keymap-*.map" SRC_URI_append_collie = " file://keymap-*.map" SRC_URI_append_poodle = " file://keymap-*.map" SRC_URI_append_jornada6xx = " file://keymap-*.map" - +SRC_URI_append_h2200 = " file://keymap-*.map" INITSCRIPT_NAME = "keymap" INITSCRIPT_PARAMS = "start 00 S ." @@ -27,7 +27,7 @@ do_install () { install -m 0755 ${WORKDIR}/keymap ${D}${sysconfdir}/init.d/ case ${MACHINE} in - c7x0 | tosa | spitz | akita | borzoi | collie | poodle | jornada6xx) + c7x0 | tosa | spitz | akita | borzoi | collie | poodle | jornada6xx | h2200) install -m 0644 ${WORKDIR}/keymap-*.map ${D}${sysconfdir} ;; *) diff --git a/packages/mysql/mysql_4.1.18.bb b/packages/mysql/mysql_4.1.18.bb index 53165ac8d4..79f22e8562 100644 --- a/packages/mysql/mysql_4.1.18.bb +++ b/packages/mysql/mysql_4.1.18.bb @@ -5,7 +5,7 @@ DEPENDS += "ncurses mysql-native" LICENSE = "GPL" PR="r2" -SRC_URI = "http://mirrors.develooper.com/mysql/Downloads/MySQL-4.1/mysql-${PV}.tar.gz \ +SRC_URI = "http://downloads.mysql.com/archives/mysql-4.1/mysql-${PV}.tar.gz \ file://autofoo.patch;patch=1 \ file://gen_lex_hash.patch;patch=1 \ file://my.cnf \ diff --git a/packages/xorg-app/xterm_207.bb b/packages/xorg-app/xterm_207.bb index 5fc59a1c37..03b9b3873c 100644 --- a/packages/xorg-app/xterm_207.bb +++ b/packages/xorg-app/xterm_207.bb @@ -3,7 +3,7 @@ SECTION = "x11/apps" #MAINTAINER = "" LICENSE = "MIT-X" -DEPENDS = "xproto virtual/libx11 xextproto xext xau xpm ncurses" +DEPENDS = "libxaw xproto virtual/libx11 xextproto xext xau xpm ncurses" SRC_URI = "${XORG_MIRROR}/development/X11R7.0-RC4/extras/${PN}-${PV}.tar.gz" |