diff options
-rw-r--r-- | conf/distro/include/preferred-opie-cvs-versions.inc | 2 | ||||
-rw-r--r-- | conf/distro/include/preferred-opie-versions-1.2.3.inc | 2 | ||||
-rw-r--r-- | conf/distro/include/preferred-opie-versions-1.2.4-pre.inc | 2 | ||||
-rw-r--r-- | packages/mysql/files/fix_host_path.patch | 25 | ||||
-rw-r--r-- | packages/mysql/mysql_4.1.22.bb | 2 |
5 files changed, 23 insertions, 10 deletions
diff --git a/conf/distro/include/preferred-opie-cvs-versions.inc b/conf/distro/include/preferred-opie-cvs-versions.inc index 8ffad210bb..79fc56c08c 100644 --- a/conf/distro/include/preferred-opie-cvs-versions.inc +++ b/conf/distro/include/preferred-opie-cvs-versions.inc @@ -206,4 +206,4 @@ SRCDATE_opie-zkbapplet ?= "${OPIE_VERSION}" SRCDATE_opie-zlines ?= "${OPIE_VERSION}" SRCDATE_opie-zsafe ?= "${OPIE_VERSION}" SRCDATE_opie-zsame ?= "${OPIE_VERSION}" -PREFERRED_VERSION_konqueror-embedded = "20060404" +PREFERRED_VERSION_konqueror-embedded = "20070316" diff --git a/conf/distro/include/preferred-opie-versions-1.2.3.inc b/conf/distro/include/preferred-opie-versions-1.2.3.inc index ffcbbc2217..56bb4fbeaa 100644 --- a/conf/distro/include/preferred-opie-versions-1.2.3.inc +++ b/conf/distro/include/preferred-opie-versions-1.2.3.inc @@ -208,4 +208,4 @@ PREFERRED_VERSION_opie-zsafe = "${OPIE_VERSION}" PREFERRED_VERSION_opie-zsame = "${OPIE_VERSION}" PREFERRED_VERSION_opie-sh-snes = "${OPIE_VERSION}" PREFERRED_VERSION_opie-stumbler = "${OPIE_VERSION}" -PREFERRED_VERSION_konqueror-embedded = "20070212" +PREFERRED_VERSION_konqueror-embedded = "20070316" diff --git a/conf/distro/include/preferred-opie-versions-1.2.4-pre.inc b/conf/distro/include/preferred-opie-versions-1.2.4-pre.inc index d6c43a3839..10d0833c6c 100644 --- a/conf/distro/include/preferred-opie-versions-1.2.4-pre.inc +++ b/conf/distro/include/preferred-opie-versions-1.2.4-pre.inc @@ -221,7 +221,7 @@ PREFERRED_VERSION_opie-zsame = "${OPIE_VERSION}" PREFERRED_VERSION_opie-sh-snes = "${OPIE_VERSION}" PREFERRED_VERSION_opie-stumbler = "${OPIE_VERSION}" -PREFERRED_VERSION_konqueror-embedded = "20070212" +PREFERRED_VERSION_konqueror-embedded = "20070316" SRCDATE_opie-aboutapplet = "${OPIE_SRCDATE}" diff --git a/packages/mysql/files/fix_host_path.patch b/packages/mysql/files/fix_host_path.patch index 4ba1cc0838..4f69cd5198 100644 --- a/packages/mysql/files/fix_host_path.patch +++ b/packages/mysql/files/fix_host_path.patch @@ -13,12 +13,25 @@ # for build ndb docs -@@ -527,7 +527,7 @@ else +@@ -516,16 +516,17 @@ AC_MSG_RESULT("$FIND_PROC") + + # Check if a pid is valid + AC_PATH_PROG(KILL, kill, kill) ++AC_SUBST(KILL,/bin/kill) + AC_MSG_CHECKING("for kill switches") +-if $ac_cv_path_KILL -0 $$ ++if $KILL -0 $$ + then +- CHECK_PID="$ac_cv_path_KILL -0 \$\$PID > /dev/null 2> /dev/null" ++ CHECK_PID="$KILL -0 \$\$PID > /dev/null 2> /dev/null" + elif kill -s 0 $$ + then +- CHECK_PID="$ac_cv_path_KILL -s 0 \$\$PID > /dev/null 2> /dev/null" ++ CHECK_PID="$KILL -s 0 \$\$PID > /dev/null 2> /dev/null" + else AC_MSG_WARN([kill -0 to check for pid seems to fail]) - CHECK_PID="$ac_cv_path_KILL -s SIGCONT \$\$PID > /dev/null 2> /dev/null" +- CHECK_PID="$ac_cv_path_KILL -s SIGCONT \$\$PID > /dev/null 2> /dev/null" ++ CHECK_PID="$KILL -s SIGCONT \$\$PID > /dev/null 2> /dev/null" fi --AC_SUBST(CHECK_PID) -+AC_SUBST(CHECK_PID,/bin/kill) + AC_SUBST(CHECK_PID) AC_MSG_RESULT("$CHECK_PID") - - # We need an ANSI C compiler diff --git a/packages/mysql/mysql_4.1.22.bb b/packages/mysql/mysql_4.1.22.bb index c60758b19f..8d7f4057f6 100644 --- a/packages/mysql/mysql_4.1.22.bb +++ b/packages/mysql/mysql_4.1.22.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.mysql.com/" SECTION = "libs" LICENSE = "GPL" DEPENDS = "ncurses" -PR = "r1" +PR = "r2" SRC_URI = "http://downloads.mysql.com/archives/mysql-4.1/mysql-${PV}.tar.gz \ file://autofoo.patch;patch=1 \ |