From b703aeae0906cefdd0fdf5a84ad3da0668758bb6 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 5 May 2006 16:21:46 +0000 Subject: site/arm-linux-gnueabi: update site file with dpkg and enca bits --- site/arm-linux-gnueabi | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/site/arm-linux-gnueabi b/site/arm-linux-gnueabi index aff569c013..7c9fb85d0b 100644 --- a/site/arm-linux-gnueabi +++ b/site/arm-linux-gnueabi @@ -367,3 +367,11 @@ with_broken_putenv=${with_broken_putenv=no} # xffm jm_cv_func_working_readdir=yes + +# dpkg +dpkg_cv_va_copy=${ac_cv_va_copy=no} +dpkg_cv___va_copy=${ac_cv___va_copy=yes} + +# enca +yeti_cv_func_scanf_modif_size_t=yes + -- cgit v1.2.3 From da7b90aadf644db9e6156670882ba537503f228d Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 5 May 2006 17:18:47 +0000 Subject: mysql: updated to 4.1.18 (security fixes) --- packages/mysql/files/.mtn2git_empty | 0 packages/mysql/files/autofoo.patch | 317 +++++++++++++++++++++++++ packages/mysql/files/gen_lex_hash.patch | 19 ++ packages/mysql/mysql-4.1.16/.mtn2git_empty | 0 packages/mysql/mysql-4.1.16/autofoo.patch | 317 ------------------------- packages/mysql/mysql-4.1.16/gen_lex_hash.patch | 19 -- packages/mysql/mysql-native_4.1.16.bb | 16 -- packages/mysql/mysql-native_4.1.18.bb | 16 ++ packages/mysql/mysql_4.1.16.bb | 46 ---- packages/mysql/mysql_4.1.18.bb | 46 ++++ 10 files changed, 398 insertions(+), 398 deletions(-) create mode 100644 packages/mysql/files/.mtn2git_empty create mode 100644 packages/mysql/files/autofoo.patch create mode 100644 packages/mysql/files/gen_lex_hash.patch delete mode 100644 packages/mysql/mysql-4.1.16/.mtn2git_empty delete mode 100644 packages/mysql/mysql-4.1.16/autofoo.patch delete mode 100644 packages/mysql/mysql-4.1.16/gen_lex_hash.patch delete mode 100644 packages/mysql/mysql-native_4.1.16.bb create mode 100644 packages/mysql/mysql-native_4.1.18.bb delete mode 100644 packages/mysql/mysql_4.1.16.bb create mode 100644 packages/mysql/mysql_4.1.18.bb diff --git a/packages/mysql/files/.mtn2git_empty b/packages/mysql/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/mysql/files/autofoo.patch b/packages/mysql/files/autofoo.patch new file mode 100644 index 0000000000..f2d5354572 --- /dev/null +++ b/packages/mysql/files/autofoo.patch @@ -0,0 +1,317 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- mysql-4.1.15/acinclude.m4~autofoo ++++ mysql-4.1.15/acinclude.m4 +@@ -1,5 +1,88 @@ + # Local macros for automake & autoconf + ++AH_TEMPLATE([SPRINTF_RETURNS_INT], [sprintf returns an int]) ++AH_TEMPLATE([SPRINTF_RETURNS_PTR], [sprintf returns a char *]) ++AH_TEMPLATE([SPRINTF_RETURNS_GARBAGE], [sprintf returns something unknown to us]) ++ ++AC_DEFUN([MYSQL_SPRINTF_RET], [ ++ AC_CACHE_CHECK([return type of sprintf], ++ [mysql_cv_func_sprintf_ret], [ ++ old_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS -Werror" ++ AC_COMPILE_IFELSE([ ++#include ++int sprintf(char *str, const char *format, ...); ++ ], [mysql_cv_func_sprintf_ret=int], ++ AC_COMPILE_IFELSE([ ++#include ++char * sprintf(char *str, const char *format, ...); ++ ], [mysql_cv_func_sprintf_ret=ptr], ++ [mysql_cv_func_sprintf_ret=unknown]) ++ ) ++ CFLAGS="$old_CFLAGS" ++ ]) ++ if test x"$mysql_cv_func_sprintf_ret" = "xint"; then ++ AC_DEFINE([SPRINTF_RETURNS_INT], [1]) ++ elif test x"$mysql_cv_func_sprintf_ret" = "xptr"; then ++ AC_DEFINE([SPRINTF_RETURNS_PTR], [1]) ++ else ++ AC_DEFINE([SPRINTF_RETURNS_GARBAGE], [1]) ++ fi ++]) ++ ++# _MYSQL_FUNC_ATOMIC_ADD ++# ---------------------- ++# Check for Linux specific atomic_add function ++AC_DEFUN([_MYSQL_FUNC_ATOMIC_ADD], ++[AC_CACHE_CHECK([for atomic_add], [mysql_cv_func_atomic_add], ++[AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include ]], ++ [ ++int main() ++{ ++ atomic_t v; ++ ++ atomic_set(&v, 23); ++ atomic_add(5, &v); ++ return atomic_read(&v) == 28 ? 0 : -1; ++} ++ ])], ++ [mysql_cv_func_atomic_add=yes], ++ [mysql_cv_func_atomic_add=no])]) ++ if test x"$mysql_func_atomic_add" = "xyes"; then ++ AC_DEFINE([HAVE_ATOMIC_ADD], [1]) ++ fi[]dnl ++])# _MYSQL_FUNC_ATOMIC_ADD ++ ++# _MYSQL_FUNC_ATOMIC_SUB ++# ---------------------- ++# Check for Linux specific atomic_sub function ++AC_DEFUN([_MYSQL_FUNC_ATOMIC_SUB], ++[AC_CACHE_CHECK([for atomic_sub], [mysql_cv_func_atomic_sub], ++[AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include ]], ++ [ ++int main() ++{ ++ atomic_t v; ++ ++ atomic_set(&v, 23); ++ atomic_sub(5, &v); ++ return atomic_read(&v) == 18 ? 0 : -1; ++} ++ ])], ++ [mysql_cv_func_atomic_sub=yes], ++ [mysql_cv_func_atomic_sub=no])]) ++ if test x"$mysql_func_atomic_sub" = "xyes"; then ++ AC_DEFINE([HAVE_ATOMIC_SUB], [1]) ++ fi[]dnl ++])# _MYSQL_FUNC_ATOMIC_SUB ++ ++# MYSQL_FUNCS_ATOMIC ++# ------------------ ++# Check for Linux specific atomic add and sub functions ++AC_DEFUN([MYSQL_FUNCS_ATOMIC], [ ++ AC_REQUIRE([_MYSQL_FUNC_ATOMIC_ADD])dnl ++ AC_REQUIRE([_MYSQL_FUNC_ATOMIC_SUB])dnl ++])# MYSQL_FUNCS_ATOMIC + + AC_DEFUN([MYSQL_CHECK_READLINE_DECLARES_HIST_ENTRY], [ + AC_CACHE_CHECK([HIST_ENTRY is declared in readline/readline.h], mysql_cv_hist_entry_declared, +@@ -340,7 +423,7 @@ + AC_DEFUN([MYSQL_CHECK_ULONG], + [AC_MSG_CHECKING(for type ulong) + AC_CACHE_VAL(ac_cv_ulong, +-[AC_TRY_RUN([#include ++[AC_TRY_LINK([#include + #include + main() + { +@@ -358,7 +441,7 @@ + AC_DEFUN([MYSQL_CHECK_UCHAR], + [AC_MSG_CHECKING(for type uchar) + AC_CACHE_VAL(ac_cv_uchar, +-[AC_TRY_RUN([#include ++[AC_TRY_LINK([#include + #include + main() + { +@@ -376,7 +459,7 @@ + AC_DEFUN([MYSQL_CHECK_UINT], + [AC_MSG_CHECKING(for type uint) + AC_CACHE_VAL(ac_cv_uint, +-[AC_TRY_RUN([#include ++[AC_TRY_LINK([#include + #include + main() + { +@@ -395,7 +478,7 @@ + AC_DEFUN([MYSQL_CHECK_IN_ADDR_T], + [AC_MSG_CHECKING(for type in_addr_t) + AC_CACHE_VAL(ac_cv_in_addr_t, +-[AC_TRY_RUN([#include ++[AC_TRY_LINK([#include + #include + #include + #include +@@ -456,7 +539,7 @@ + AC_DEFUN([MYSQL_CHECK_FP_EXCEPT], + [AC_MSG_CHECKING(for type fp_except) + AC_CACHE_VAL(ac_cv_fp_except, +-[AC_TRY_RUN([#include ++[AC_TRY_LINK([#include + #include + #include + main() +--- mysql-4.1.15/configure.in~autofoo ++++ mysql-4.1.15/configure.in +@@ -234,8 +234,6 @@ + else + AC_PATH_PROG(AS, as, as) + fi +-# Still need ranlib for readline; local static use only so no libtool. +-AC_PROG_RANLIB + # We use libtool + #AC_LIBTOOL_WIN32_DLL + AC_PROG_LIBTOOL +@@ -256,44 +254,7 @@ + AC_CHECK_PROG(PDFMANUAL, pdftex, manual.pdf) + AC_CHECK_PROG(DVIS, tex, manual.dvi) + +-AC_MSG_CHECKING("return type of sprintf") +- +-#check the return type of sprintf +-case $SYSTEM_TYPE in +- *netware*) +- AC_DEFINE(SPRINTF_RETURNS_INT, [1]) AC_MSG_RESULT("int") +- ;; +- *) +-AC_TRY_RUN([ +- int main() +- { +- char* s = "hello"; +- char buf[6]; +- if((int)sprintf(buf, s) == strlen(s)) +- return 0; +- +- return -1; +- } +- ], +- [AC_DEFINE(SPRINTF_RETURNS_INT, [1], [POSIX sprintf]) +- AC_MSG_RESULT("int")], +- [AC_TRY_RUN([ +- int main() +- { +- char* s = "hello"; +- char buf[6]; +- if((char*)sprintf(buf,s) == buf + strlen(s)) +- return 0; +- return -1; +- } ], +- [AC_DEFINE(SPRINTF_RETURNS_PTR, [1], [Broken sprintf]) +- AC_MSG_RESULT("ptr")], +- [AC_DEFINE(SPRINTF_RETURNS_GARBAGE, [1], [Broken sprintf]) +- AC_MSG_RESULT("garbage")]) +- ]) +- ;; +-esac +- ++MYSQL_SPRINTF_RET + + # option, cache_name, variable, + # code to execute if yes, code to exectute if fail +@@ -870,42 +831,7 @@ + AC_SUBST(WRAPLIBS) + + if test "$TARGET_LINUX" = "true"; then +- AC_MSG_CHECKING([for atomic operations]) +- +- atom_ops= +- AC_TRY_RUN([ +-#include +-int main() +-{ +- atomic_t v; +- +- atomic_set(&v, 23); +- atomic_add(5, &v); +- return atomic_read(&v) == 28 ? 0 : -1; +-} +- ], +- [AC_DEFINE([HAVE_ATOMIC_ADD], [1], +- [atomic_add() from (Linux only)]) +- atom_ops="${atom_ops}atomic_add "], +- ) +- AC_TRY_RUN([ +-#include +-int main() +-{ +- atomic_t v; +- +- atomic_set(&v, 23); +- atomic_sub(5, &v); +- return atomic_read(&v) == 18 ? 0 : -1; +-} +- ], +- [AC_DEFINE([HAVE_ATOMIC_SUB], [1], +- [atomic_sub() from (Linux only)]) +- atom_ops="${atom_ops}atomic_sub "], +- ) +- +- if test -z "$atom_ops"; then atom_ops="no"; fi +- AC_MSG_RESULT($atom_ops) ++ MYSQL_FUNCS_ATOMIC + + AC_ARG_WITH(pstack, + [ --with-pstack Use the pstack backtrace library], +@@ -958,13 +884,13 @@ + # Later in this script LIBS will be augmented with a threads library. + NON_THREADED_LIBS="$LIBS" + +-AC_MSG_CHECKING([for int8]) ++AC_CACHE_CHECK([for int8], [mysql_cv_type_int8], [ + case $SYSTEM_TYPE in + *netware) +- AC_MSG_RESULT([no]) ++ mysql_cv_type_int8=no + ;; + *) +-AC_TRY_RUN([ ++AC_LINK_IFELSE([AC_LANG_PROGRAM([[ + #ifdef HAVE_STDLIB_H + #include + #endif +@@ -975,22 +901,21 @@ + + #ifdef HAVE_SYS_TYPES_H + #include +-#endif +- ++#endif]], [ + int main() + { + int8 i; + return 0; +-} +-], +-[AC_DEFINE([HAVE_INT_8_16_32], [1], +- [whether int8, int16 and int32 types exist]) +-AC_MSG_RESULT([yes])], +-[AC_MSG_RESULT([no])] +-) ++}])], [mysql_cv_type_int8=yes], [mysql_cv_type_int8=no]) + ;; + esac + ++if test x"$mysql_cv_type_int8" = "xyes"; then ++ AC_DEFINE([HAVE_INT_8_16_32], [1], ++ [whether int8, int16 and int32 types exist]) ++fi ++]) ++ + # + # Some system specific hacks + # +@@ -1798,7 +1723,7 @@ + AC_MSG_ERROR("MySQL needs a long long type.") + fi + # off_t is not a builtin type +-MYSQL_CHECK_SIZEOF(off_t, 4) ++AC_CHECK_SIZEOF(off_t, 4) + if test "$ac_cv_sizeof_off_t" -eq 0 + then + AC_MSG_ERROR("MySQL needs a off_t type.") +--- mysql-4.1.15/innobase/configure.in~autofoo ++++ mysql-4.1.15/innobase/configure.in +@@ -3,6 +3,7 @@ + AC_CANONICAL_SYSTEM + AM_MAINTAINER_MODE + AM_CONFIG_HEADER(ib_config.h) ++AC_CONFIG_AUX_DIR([..]) + AM_INIT_AUTOMAKE(ib, 0.90) + + # This is need before AC_PROG_CC +@@ -32,7 +33,6 @@ + CXXFLAGS="$CXXFLAGS " + + AC_PROG_CC +-AC_PROG_RANLIB + AC_PROG_INSTALL + AC_PROG_LIBTOOL + AC_CHECK_HEADERS(aio.h sched.h) diff --git a/packages/mysql/files/gen_lex_hash.patch b/packages/mysql/files/gen_lex_hash.patch new file mode 100644 index 0000000000..c398d048dc --- /dev/null +++ b/packages/mysql/files/gen_lex_hash.patch @@ -0,0 +1,19 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- mysql-4.1.15/sql/Makefile.am~gen_lexhash ++++ mysql-4.1.15/sql/Makefile.am +@@ -137,8 +137,10 @@ + @echo "If it fails, re-run configure with --with-low-memory" + $(CXXCOMPILE) $(LM_CFLAGS) -c $< + ++GEN_LEX_HASH = ./gen_lex_hash$(EXEEXT) ++ + lex_hash.h: gen_lex_hash$(EXEEXT) +- ./gen_lex_hash$(EXEEXT) > $@ ++ $(GEN_LEX_HASH) > $@ + + # For testing of udf_example.so; Works on platforms with gcc + # (This is not part of our build process but only provided as an example) diff --git a/packages/mysql/mysql-4.1.16/.mtn2git_empty b/packages/mysql/mysql-4.1.16/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/mysql/mysql-4.1.16/autofoo.patch b/packages/mysql/mysql-4.1.16/autofoo.patch deleted file mode 100644 index f2d5354572..0000000000 --- a/packages/mysql/mysql-4.1.16/autofoo.patch +++ /dev/null @@ -1,317 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- mysql-4.1.15/acinclude.m4~autofoo -+++ mysql-4.1.15/acinclude.m4 -@@ -1,5 +1,88 @@ - # Local macros for automake & autoconf - -+AH_TEMPLATE([SPRINTF_RETURNS_INT], [sprintf returns an int]) -+AH_TEMPLATE([SPRINTF_RETURNS_PTR], [sprintf returns a char *]) -+AH_TEMPLATE([SPRINTF_RETURNS_GARBAGE], [sprintf returns something unknown to us]) -+ -+AC_DEFUN([MYSQL_SPRINTF_RET], [ -+ AC_CACHE_CHECK([return type of sprintf], -+ [mysql_cv_func_sprintf_ret], [ -+ old_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS -Werror" -+ AC_COMPILE_IFELSE([ -+#include -+int sprintf(char *str, const char *format, ...); -+ ], [mysql_cv_func_sprintf_ret=int], -+ AC_COMPILE_IFELSE([ -+#include -+char * sprintf(char *str, const char *format, ...); -+ ], [mysql_cv_func_sprintf_ret=ptr], -+ [mysql_cv_func_sprintf_ret=unknown]) -+ ) -+ CFLAGS="$old_CFLAGS" -+ ]) -+ if test x"$mysql_cv_func_sprintf_ret" = "xint"; then -+ AC_DEFINE([SPRINTF_RETURNS_INT], [1]) -+ elif test x"$mysql_cv_func_sprintf_ret" = "xptr"; then -+ AC_DEFINE([SPRINTF_RETURNS_PTR], [1]) -+ else -+ AC_DEFINE([SPRINTF_RETURNS_GARBAGE], [1]) -+ fi -+]) -+ -+# _MYSQL_FUNC_ATOMIC_ADD -+# ---------------------- -+# Check for Linux specific atomic_add function -+AC_DEFUN([_MYSQL_FUNC_ATOMIC_ADD], -+[AC_CACHE_CHECK([for atomic_add], [mysql_cv_func_atomic_add], -+[AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include ]], -+ [ -+int main() -+{ -+ atomic_t v; -+ -+ atomic_set(&v, 23); -+ atomic_add(5, &v); -+ return atomic_read(&v) == 28 ? 0 : -1; -+} -+ ])], -+ [mysql_cv_func_atomic_add=yes], -+ [mysql_cv_func_atomic_add=no])]) -+ if test x"$mysql_func_atomic_add" = "xyes"; then -+ AC_DEFINE([HAVE_ATOMIC_ADD], [1]) -+ fi[]dnl -+])# _MYSQL_FUNC_ATOMIC_ADD -+ -+# _MYSQL_FUNC_ATOMIC_SUB -+# ---------------------- -+# Check for Linux specific atomic_sub function -+AC_DEFUN([_MYSQL_FUNC_ATOMIC_SUB], -+[AC_CACHE_CHECK([for atomic_sub], [mysql_cv_func_atomic_sub], -+[AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include ]], -+ [ -+int main() -+{ -+ atomic_t v; -+ -+ atomic_set(&v, 23); -+ atomic_sub(5, &v); -+ return atomic_read(&v) == 18 ? 0 : -1; -+} -+ ])], -+ [mysql_cv_func_atomic_sub=yes], -+ [mysql_cv_func_atomic_sub=no])]) -+ if test x"$mysql_func_atomic_sub" = "xyes"; then -+ AC_DEFINE([HAVE_ATOMIC_SUB], [1]) -+ fi[]dnl -+])# _MYSQL_FUNC_ATOMIC_SUB -+ -+# MYSQL_FUNCS_ATOMIC -+# ------------------ -+# Check for Linux specific atomic add and sub functions -+AC_DEFUN([MYSQL_FUNCS_ATOMIC], [ -+ AC_REQUIRE([_MYSQL_FUNC_ATOMIC_ADD])dnl -+ AC_REQUIRE([_MYSQL_FUNC_ATOMIC_SUB])dnl -+])# MYSQL_FUNCS_ATOMIC - - AC_DEFUN([MYSQL_CHECK_READLINE_DECLARES_HIST_ENTRY], [ - AC_CACHE_CHECK([HIST_ENTRY is declared in readline/readline.h], mysql_cv_hist_entry_declared, -@@ -340,7 +423,7 @@ - AC_DEFUN([MYSQL_CHECK_ULONG], - [AC_MSG_CHECKING(for type ulong) - AC_CACHE_VAL(ac_cv_ulong, --[AC_TRY_RUN([#include -+[AC_TRY_LINK([#include - #include - main() - { -@@ -358,7 +441,7 @@ - AC_DEFUN([MYSQL_CHECK_UCHAR], - [AC_MSG_CHECKING(for type uchar) - AC_CACHE_VAL(ac_cv_uchar, --[AC_TRY_RUN([#include -+[AC_TRY_LINK([#include - #include - main() - { -@@ -376,7 +459,7 @@ - AC_DEFUN([MYSQL_CHECK_UINT], - [AC_MSG_CHECKING(for type uint) - AC_CACHE_VAL(ac_cv_uint, --[AC_TRY_RUN([#include -+[AC_TRY_LINK([#include - #include - main() - { -@@ -395,7 +478,7 @@ - AC_DEFUN([MYSQL_CHECK_IN_ADDR_T], - [AC_MSG_CHECKING(for type in_addr_t) - AC_CACHE_VAL(ac_cv_in_addr_t, --[AC_TRY_RUN([#include -+[AC_TRY_LINK([#include - #include - #include - #include -@@ -456,7 +539,7 @@ - AC_DEFUN([MYSQL_CHECK_FP_EXCEPT], - [AC_MSG_CHECKING(for type fp_except) - AC_CACHE_VAL(ac_cv_fp_except, --[AC_TRY_RUN([#include -+[AC_TRY_LINK([#include - #include - #include - main() ---- mysql-4.1.15/configure.in~autofoo -+++ mysql-4.1.15/configure.in -@@ -234,8 +234,6 @@ - else - AC_PATH_PROG(AS, as, as) - fi --# Still need ranlib for readline; local static use only so no libtool. --AC_PROG_RANLIB - # We use libtool - #AC_LIBTOOL_WIN32_DLL - AC_PROG_LIBTOOL -@@ -256,44 +254,7 @@ - AC_CHECK_PROG(PDFMANUAL, pdftex, manual.pdf) - AC_CHECK_PROG(DVIS, tex, manual.dvi) - --AC_MSG_CHECKING("return type of sprintf") -- --#check the return type of sprintf --case $SYSTEM_TYPE in -- *netware*) -- AC_DEFINE(SPRINTF_RETURNS_INT, [1]) AC_MSG_RESULT("int") -- ;; -- *) --AC_TRY_RUN([ -- int main() -- { -- char* s = "hello"; -- char buf[6]; -- if((int)sprintf(buf, s) == strlen(s)) -- return 0; -- -- return -1; -- } -- ], -- [AC_DEFINE(SPRINTF_RETURNS_INT, [1], [POSIX sprintf]) -- AC_MSG_RESULT("int")], -- [AC_TRY_RUN([ -- int main() -- { -- char* s = "hello"; -- char buf[6]; -- if((char*)sprintf(buf,s) == buf + strlen(s)) -- return 0; -- return -1; -- } ], -- [AC_DEFINE(SPRINTF_RETURNS_PTR, [1], [Broken sprintf]) -- AC_MSG_RESULT("ptr")], -- [AC_DEFINE(SPRINTF_RETURNS_GARBAGE, [1], [Broken sprintf]) -- AC_MSG_RESULT("garbage")]) -- ]) -- ;; --esac -- -+MYSQL_SPRINTF_RET - - # option, cache_name, variable, - # code to execute if yes, code to exectute if fail -@@ -870,42 +831,7 @@ - AC_SUBST(WRAPLIBS) - - if test "$TARGET_LINUX" = "true"; then -- AC_MSG_CHECKING([for atomic operations]) -- -- atom_ops= -- AC_TRY_RUN([ --#include --int main() --{ -- atomic_t v; -- -- atomic_set(&v, 23); -- atomic_add(5, &v); -- return atomic_read(&v) == 28 ? 0 : -1; --} -- ], -- [AC_DEFINE([HAVE_ATOMIC_ADD], [1], -- [atomic_add() from (Linux only)]) -- atom_ops="${atom_ops}atomic_add "], -- ) -- AC_TRY_RUN([ --#include --int main() --{ -- atomic_t v; -- -- atomic_set(&v, 23); -- atomic_sub(5, &v); -- return atomic_read(&v) == 18 ? 0 : -1; --} -- ], -- [AC_DEFINE([HAVE_ATOMIC_SUB], [1], -- [atomic_sub() from (Linux only)]) -- atom_ops="${atom_ops}atomic_sub "], -- ) -- -- if test -z "$atom_ops"; then atom_ops="no"; fi -- AC_MSG_RESULT($atom_ops) -+ MYSQL_FUNCS_ATOMIC - - AC_ARG_WITH(pstack, - [ --with-pstack Use the pstack backtrace library], -@@ -958,13 +884,13 @@ - # Later in this script LIBS will be augmented with a threads library. - NON_THREADED_LIBS="$LIBS" - --AC_MSG_CHECKING([for int8]) -+AC_CACHE_CHECK([for int8], [mysql_cv_type_int8], [ - case $SYSTEM_TYPE in - *netware) -- AC_MSG_RESULT([no]) -+ mysql_cv_type_int8=no - ;; - *) --AC_TRY_RUN([ -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #ifdef HAVE_STDLIB_H - #include - #endif -@@ -975,22 +901,21 @@ - - #ifdef HAVE_SYS_TYPES_H - #include --#endif -- -+#endif]], [ - int main() - { - int8 i; - return 0; --} --], --[AC_DEFINE([HAVE_INT_8_16_32], [1], -- [whether int8, int16 and int32 types exist]) --AC_MSG_RESULT([yes])], --[AC_MSG_RESULT([no])] --) -+}])], [mysql_cv_type_int8=yes], [mysql_cv_type_int8=no]) - ;; - esac - -+if test x"$mysql_cv_type_int8" = "xyes"; then -+ AC_DEFINE([HAVE_INT_8_16_32], [1], -+ [whether int8, int16 and int32 types exist]) -+fi -+]) -+ - # - # Some system specific hacks - # -@@ -1798,7 +1723,7 @@ - AC_MSG_ERROR("MySQL needs a long long type.") - fi - # off_t is not a builtin type --MYSQL_CHECK_SIZEOF(off_t, 4) -+AC_CHECK_SIZEOF(off_t, 4) - if test "$ac_cv_sizeof_off_t" -eq 0 - then - AC_MSG_ERROR("MySQL needs a off_t type.") ---- mysql-4.1.15/innobase/configure.in~autofoo -+++ mysql-4.1.15/innobase/configure.in -@@ -3,6 +3,7 @@ - AC_CANONICAL_SYSTEM - AM_MAINTAINER_MODE - AM_CONFIG_HEADER(ib_config.h) -+AC_CONFIG_AUX_DIR([..]) - AM_INIT_AUTOMAKE(ib, 0.90) - - # This is need before AC_PROG_CC -@@ -32,7 +33,6 @@ - CXXFLAGS="$CXXFLAGS " - - AC_PROG_CC --AC_PROG_RANLIB - AC_PROG_INSTALL - AC_PROG_LIBTOOL - AC_CHECK_HEADERS(aio.h sched.h) diff --git a/packages/mysql/mysql-4.1.16/gen_lex_hash.patch b/packages/mysql/mysql-4.1.16/gen_lex_hash.patch deleted file mode 100644 index c398d048dc..0000000000 --- a/packages/mysql/mysql-4.1.16/gen_lex_hash.patch +++ /dev/null @@ -1,19 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- mysql-4.1.15/sql/Makefile.am~gen_lexhash -+++ mysql-4.1.15/sql/Makefile.am -@@ -137,8 +137,10 @@ - @echo "If it fails, re-run configure with --with-low-memory" - $(CXXCOMPILE) $(LM_CFLAGS) -c $< - -+GEN_LEX_HASH = ./gen_lex_hash$(EXEEXT) -+ - lex_hash.h: gen_lex_hash$(EXEEXT) -- ./gen_lex_hash$(EXEEXT) > $@ -+ $(GEN_LEX_HASH) > $@ - - # For testing of udf_example.so; Works on platforms with gcc - # (This is not part of our build process but only provided as an example) diff --git a/packages/mysql/mysql-native_4.1.16.bb b/packages/mysql/mysql-native_4.1.16.bb deleted file mode 100644 index c871a8f9da..0000000000 --- a/packages/mysql/mysql-native_4.1.16.bb +++ /dev/null @@ -1,16 +0,0 @@ -SECTION = "console/network" -include mysql_${PV}.bb -inherit native - -PACKAGES = "" -DEPENDS = "ncurses-native" -EXTRA_OEMAKE = "" -EXTRA_OECONF = " --with-embedded-server " - -do_stage() { - install -m 0755 sql/gen_lex_hash ${STAGING_BINDIR}/ -} - -do_install() { - : -} diff --git a/packages/mysql/mysql-native_4.1.18.bb b/packages/mysql/mysql-native_4.1.18.bb new file mode 100644 index 0000000000..c871a8f9da --- /dev/null +++ b/packages/mysql/mysql-native_4.1.18.bb @@ -0,0 +1,16 @@ +SECTION = "console/network" +include mysql_${PV}.bb +inherit native + +PACKAGES = "" +DEPENDS = "ncurses-native" +EXTRA_OEMAKE = "" +EXTRA_OECONF = " --with-embedded-server " + +do_stage() { + install -m 0755 sql/gen_lex_hash ${STAGING_BINDIR}/ +} + +do_install() { + : +} diff --git a/packages/mysql/mysql_4.1.16.bb b/packages/mysql/mysql_4.1.16.bb deleted file mode 100644 index fe8c42dd88..0000000000 --- a/packages/mysql/mysql_4.1.16.bb +++ /dev/null @@ -1,46 +0,0 @@ -DESCRIPTION = "The MySQL Open Source Database System" -SECTION = "libs" -DEPENDS += "ncurses mysql-native" -LICENSE = "GPL" - -SRC_URI = "http://mirrors.develooper.com/mysql/Downloads/MySQL-4.1/mysql-${PV}.tar.gz \ - file://autofoo.patch;patch=1 \ - file://gen_lex_hash.patch;patch=1" - -S = "${WORKDIR}/mysql-${PV}" - -FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/mysql-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" - -BINCONFIG_GLOB = "mysql_config" -inherit autotools binconfig - - -EXTRA_OEMAKE = "'GEN_LEX_HASH=${STAGING_BINDIR}/gen_lex_hash'" -EXTRA_OECONF = " --with-embedded-server --prefix=/usr --sysconfdir=/etc/mysql --localstatedir=/var/mysql --datadir=/var/mysql --disable-dependency-tracking --without-raid --without-debug --with-low-memory --without-query-cache --without-man --without-docs --without-innodb " - -do_stage() { - autotools_stage_includes - oe_libinstall -a -so -C libmysql libmysqlclient ${STAGING_LIBDIR} - oe_libinstall -a -C libmysqld libmysqld ${STAGING_LIBDIR} -} - -do_install() { - oe_runmake 'DESTDIR=${D}' install - mv -f ${D}${libdir}/mysql/* ${D}${libdir} - rmdir ${D}${libdir}/mysql -} - -pkg_postinst () { - grep mysql /etc/passwd || adduser --disabled-password --home=/var/mysql --ingroup nogroup mysql -} - -pkg_postrm () { - grep mysql /etc/passwd && deluser mysql -} - -PACKAGES =+ "libmysqlclient libmysqlclient-dev" - -FILES_libmysqlclient = "${libdir}/libmysqlclient*.so.*" -FILES_libmysqlclient-dev = "${incdir}/mysql ${libdir}/lib* \ - ${bindir}/mysql_config" - diff --git a/packages/mysql/mysql_4.1.18.bb b/packages/mysql/mysql_4.1.18.bb new file mode 100644 index 0000000000..fe8c42dd88 --- /dev/null +++ b/packages/mysql/mysql_4.1.18.bb @@ -0,0 +1,46 @@ +DESCRIPTION = "The MySQL Open Source Database System" +SECTION = "libs" +DEPENDS += "ncurses mysql-native" +LICENSE = "GPL" + +SRC_URI = "http://mirrors.develooper.com/mysql/Downloads/MySQL-4.1/mysql-${PV}.tar.gz \ + file://autofoo.patch;patch=1 \ + file://gen_lex_hash.patch;patch=1" + +S = "${WORKDIR}/mysql-${PV}" + +FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/mysql-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" + +BINCONFIG_GLOB = "mysql_config" +inherit autotools binconfig + + +EXTRA_OEMAKE = "'GEN_LEX_HASH=${STAGING_BINDIR}/gen_lex_hash'" +EXTRA_OECONF = " --with-embedded-server --prefix=/usr --sysconfdir=/etc/mysql --localstatedir=/var/mysql --datadir=/var/mysql --disable-dependency-tracking --without-raid --without-debug --with-low-memory --without-query-cache --without-man --without-docs --without-innodb " + +do_stage() { + autotools_stage_includes + oe_libinstall -a -so -C libmysql libmysqlclient ${STAGING_LIBDIR} + oe_libinstall -a -C libmysqld libmysqld ${STAGING_LIBDIR} +} + +do_install() { + oe_runmake 'DESTDIR=${D}' install + mv -f ${D}${libdir}/mysql/* ${D}${libdir} + rmdir ${D}${libdir}/mysql +} + +pkg_postinst () { + grep mysql /etc/passwd || adduser --disabled-password --home=/var/mysql --ingroup nogroup mysql +} + +pkg_postrm () { + grep mysql /etc/passwd && deluser mysql +} + +PACKAGES =+ "libmysqlclient libmysqlclient-dev" + +FILES_libmysqlclient = "${libdir}/libmysqlclient*.so.*" +FILES_libmysqlclient-dev = "${incdir}/mysql ${libdir}/lib* \ + ${bindir}/mysql_config" + -- cgit v1.2.3 From 6d70a8b8c6ecba9fad63754a1ee2b3ea7eec67e0 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 5 May 2006 17:25:47 +0000 Subject: wpa_gui: added 0.4.8 - its GUI tool to scan and configure WiFi networks - need qt3/x11 --- packages/wpa-supplicant/wpa-gui_0.4.8.bb | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 packages/wpa-supplicant/wpa-gui_0.4.8.bb diff --git a/packages/wpa-supplicant/wpa-gui_0.4.8.bb b/packages/wpa-supplicant/wpa-gui_0.4.8.bb new file mode 100644 index 0000000000..0908a5c995 --- /dev/null +++ b/packages/wpa-supplicant/wpa-gui_0.4.8.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "Qt interface for choosing which configured network to connect \ +to. It also provides a method for browsing 802.11 SSID scan results, an event \ +history log of messages generated by wpa_supplicant, and a method to add or \ +edit wpa_supplicant networks." +SECTION = "network" +LICENSE = "GPL BSD" +HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/" + +SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz " + +S = "${WORKDIR}/wpa_supplicant-${PV}/wpa_gui/" + +inherit qmake qt3x11 + +EXTRA_QMAKEVARS_POST += "CONFIG+=thread" + +do_install () { + install -d ${D}${sbindir} + install -m 755 wpa_gui ${D}${sbindir} +} -- cgit v1.2.3 From 987f0243ed22a455d2b2fec3eaf3526cd37ac454 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 5 May 2006 18:28:11 +0000 Subject: added irdadump 0.9.16 --- packages/irda-utils/irdadump_0.9.16.bb | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 packages/irda-utils/irdadump_0.9.16.bb diff --git a/packages/irda-utils/irdadump_0.9.16.bb b/packages/irda-utils/irdadump_0.9.16.bb new file mode 100644 index 0000000000..98d28b60a3 --- /dev/null +++ b/packages/irda-utils/irdadump_0.9.16.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "Utility to dump IrDA traffic." +SECTION = "base" +LICENSE = "GPL" +DEPENDS = "glib-1.2" + +SRC_URI = "${SOURCEFORGE_MIRROR}/irda/irda-utils-${PV}.tar.gz" + +S="${WORKDIR}/irda-utils-${PV}/irdadump" + +EXTRA_CFLAGS += "-I${STAGING_INCDIR}/glib-1.2/" +EXTRA_LDFLAGS += "-lglib" + +inherit autotools + +do_compile() { + oe_runmake CFLAGS="${CFLAGS} ${EXTRA_CFLAGS}" LDFLAGS="${LDFLAGS} ${EXTRA_LDFLAGS}" +} + +do_install () { + install -d ${D}${bindir} + install -m 0755 ${S}/shell/.libs/irdadump ${D}${bindir} +} -- cgit v1.2.3 From 3e2effd8fab714985d1187e17ba1fb484439b78d Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 29 Apr 2006 12:27:49 +0000 Subject: slugos-init: Removed the modprobes from linuxrc while we have those modules compiled into the kernel. --- packages/slugos-init/files/turnup | 12 ++++++------ packages/slugos-init/slugos-init_0.10.bb | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/slugos-init/files/turnup b/packages/slugos-init/files/turnup index 55750dd5fe..ff1397e4c1 100644 --- a/packages/slugos-init/files/turnup +++ b/packages/slugos-init/files/turnup @@ -406,12 +406,12 @@ boot_rootfs() { return 1 };; *) { echo '#!/bin/sh' - echo 'modprobe ehci-hcd' - echo 'modprobe ohci-hcd' - echo 'modprobe sd_mod' - echo 'modprobe usb-storage' - echo 'modprobe ext3' - echo 'sleep 5' +# echo 'modprobe ehci-hcd' +# echo 'modprobe ohci-hcd' +# echo 'modprobe sd_mod' +# echo 'modprobe usb-storage' +# echo 'modprobe ext3' +# echo 'sleep 5' echo 'leds beep' test "$sleep" -gt 0 && echo -n "sleep='$sleep' " test -n "$uuid" && echo -n "UUID='$uuid' " diff --git a/packages/slugos-init/slugos-init_0.10.bb b/packages/slugos-init/slugos-init_0.10.bb index c57f985f81..6a46eb49d7 100644 --- a/packages/slugos-init/slugos-init_0.10.bb +++ b/packages/slugos-init/slugos-init_0.10.bb @@ -4,7 +4,7 @@ PRIORITY = "required" LICENSE = "GPL" DEPENDS = "base-files devio" RDEPENDS = "busybox devio" -PR = "r61" +PR = "r62" SRC_URI = "file://boot/flash \ file://boot/disk \ -- cgit v1.2.3 From 101afde2841e3c110181ad4c71bb0cbeae0f1fa1 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 1 May 2006 18:58:46 +0000 Subject: glib: update to 2.8.4 --- packages/glib-2.0/glib-2.0_2.8.4.bb | 45 +++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 packages/glib-2.0/glib-2.0_2.8.4.bb diff --git a/packages/glib-2.0/glib-2.0_2.8.4.bb b/packages/glib-2.0/glib-2.0_2.8.4.bb new file mode 100644 index 0000000000..d660b61c06 --- /dev/null +++ b/packages/glib-2.0/glib-2.0_2.8.4.bb @@ -0,0 +1,45 @@ +DESCRIPTION = "GLib is a general-purpose utility library, \ +which provides many useful data types, macros, \ +type conversions, string utilities, file utilities, a main \ +loop abstraction, and so on. It works on many \ +UNIX-like platforms, Windows, OS/2 and BeOS." +LICENSE = "LGPL" +SECTION = "libs" +PRIORITY = "optional" +DEPENDS += "glib-2.0-native gtk-doc" +DEPENDS += "virtual/libiconv virtual/libintl" +PACKAGES =+ "glib-2.0-utils " +PR = "r1" + +LEAD_SONAME = "libglib-2.0.*" +FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN}-dev += "${libdir}/glib-2.0/include ${datadir}/glib-2.0/gettext" +FILES_glib-2.0-utils = "${bindir}/*" + +EXTRA_OECONF = "--disable-debug" + +SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/glib-${PV}.tar.bz2 \ + file://glibconfig-sysdefs.h" + +S = "${WORKDIR}/glib-${PV}" + +inherit autotools pkgconfig gettext + +python () { + if bb.data.getVar("USE_NLS", d, 1) == "no": + raise bb.parse.SkipPackage("${PN} requires native language support.") +} + +acpaths = "" +do_configure_prepend () { + install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h . +} + +do_stage () { + autotools_stage_all + install -d ${STAGING_INCDIR}/glib-2.0/glib + install -m 0755 ${S}/glibconfig.h ${STAGING_INCDIR}/glib-2.0/glibconfig.h + install -d ${STAGING_DATADIR}/aclocal + install -m 0644 ${S}/m4macros/glib-2.0.m4 ${STAGING_DATADIR}/aclocal/glib-2.0.m4 + install -m 0644 ${S}/m4macros/glib-gettext.m4 ${STAGING_DATADIR}/aclocal/glib-gettext.m4 +} -- cgit v1.2.3 From 1d58c916264c6d87021435329b30108cab9819e7 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 1 May 2006 19:50:43 +0000 Subject: freetype 2.1.10: apply patch to fix rpath abuse, courtesy Phil Blundell --- packages/freetype/files/no-hardcode.patch | 11 +++++++++++ packages/freetype/freetype_2.1.10.bb | 5 +++-- 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 packages/freetype/files/no-hardcode.patch diff --git a/packages/freetype/files/no-hardcode.patch b/packages/freetype/files/no-hardcode.patch new file mode 100644 index 0000000000..44ae450a14 --- /dev/null +++ b/packages/freetype/files/no-hardcode.patch @@ -0,0 +1,11 @@ +--- freetype-2.1.10/builds/unix/freetype-config.in.old 2006-05-01 12:39:20.000000000 +0100 ++++ freetype-2.1.10/builds/unix/freetype-config.in 2006-05-01 12:39:34.000000000 +0100 +@@ -16,7 +16,7 @@ + libdir=@libdir@ + enable_shared=@enable_shared@ + wl=@wl@ +-hardcode_libdir_flag_spec='@hardcode_libdir_flag_spec@' ++hardcode_libdir_flag_spec='' + + usage() + { diff --git a/packages/freetype/freetype_2.1.10.bb b/packages/freetype/freetype_2.1.10.bb index 772b316cc8..35c0d0cbd6 100644 --- a/packages/freetype/freetype_2.1.10.bb +++ b/packages/freetype/freetype_2.1.10.bb @@ -2,10 +2,11 @@ DESCRIPTION = "Freetype font rendering library" HOMEPAGE = "http://www.freetype.org" SECTION = "libs" LICENSE = "freetype" -PR = "r0" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \ - file://configure.patch;patch=1" + file://configure.patch;patch=1 \ + file://no-hardcode.patch;patch=1" S = "${WORKDIR}/freetype-${PV}" inherit autotools pkgconfig binconfig -- cgit v1.2.3 From b0001466290c332ff1720a5ed3763511826e4167 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 2 May 2006 07:10:34 +0000 Subject: libcroco: update to 0.6.1 --- packages/libcroco/libcroco_0.6.1.bb | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 packages/libcroco/libcroco_0.6.1.bb diff --git a/packages/libcroco/libcroco_0.6.1.bb b/packages/libcroco/libcroco_0.6.1.bb new file mode 100644 index 0000000000..d5553cf138 --- /dev/null +++ b/packages/libcroco/libcroco_0.6.1.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "The Libcroco project is an effort to build a generic Cascading Style Sheet (CSS) parsing and manipulation toolkit" +SECTION = "x11/utils" +MAINTAINER = "Koen Kooi " +DEPENDS = "glib-2.0 libxml2" +LICENSE = "LGPL" +PR = "r0" + +inherit autotools pkgconfig gnome + +do_stage() { + autotools_stage_all +} -- cgit v1.2.3 From f6bb411f9a58f8b13a2b273f6b101c4cd7b005f0 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 2 May 2006 09:58:58 +0000 Subject: gnuz: fixed levels - close #835 --- packages/gnuz/gnuz_0.3.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/gnuz/gnuz_0.3.bb b/packages/gnuz/gnuz_0.3.bb index 54056d7a8a..9a164978ff 100644 --- a/packages/gnuz/gnuz_0.3.bb +++ b/packages/gnuz/gnuz_0.3.bb @@ -5,14 +5,14 @@ MAINTAINER = "Marcin Juszkiewicz " LICENSE = "GPL" AUTHOR = "Lukas Fraser" HOMEPAGE = "http://gnuz.4cows.net/eraser/gnuz/" -PR = "r1" +PR = "r2" APPTYPE = "binary" APPNAME = "gnuz" APPDESKTOP = "${S}/data/" SRC_URI = "http://gnuz.4cows.net/eraser/gnuz/gnuz_0.3.tar.gz \ - http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/gnuz-levels-0.3.tar.bz2" + http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/gnuz-levels-0.3-1.tar.bz2" S = "${WORKDIR}/gnuz" -- cgit v1.2.3 From e64c00e3dea991e7a540afa4b5974b2bdd14c9ef Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 2 May 2006 18:04:41 +0000 Subject: libcroco: fix staging --- packages/libcroco/libcroco_0.6.1.bb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/libcroco/libcroco_0.6.1.bb b/packages/libcroco/libcroco_0.6.1.bb index d5553cf138..d92987adf3 100644 --- a/packages/libcroco/libcroco_0.6.1.bb +++ b/packages/libcroco/libcroco_0.6.1.bb @@ -3,10 +3,13 @@ SECTION = "x11/utils" MAINTAINER = "Koen Kooi " DEPENDS = "glib-2.0 libxml2" LICENSE = "LGPL" -PR = "r0" +PR = "r1" inherit autotools pkgconfig gnome do_stage() { - autotools_stage_all + install -d ${STAGING_LIBDIR} + install -d ${STAGING_INCDIR}/libcroco + install -m 644 src/*.h ${STAGING_INCDIR}/libcroco/ + install -m 755 src/.libs/*so* ${STAGING_LIBDIR}/ } -- cgit v1.2.3 From d08fb535971f6269da3d4f85d5cee0074efd52d3 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 2 May 2006 18:19:01 +0000 Subject: jornada6xx.conf: sh -> sh3 and remove PREFERRED_VERSIONS, those should be in the $DISTRO.conf --- conf/machine/jornada6xx.conf | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/conf/machine/jornada6xx.conf b/conf/machine/jornada6xx.conf index 03fa7faa62..5aa492f57d 100644 --- a/conf/machine/jornada6xx.conf +++ b/conf/machine/jornada6xx.conf @@ -2,9 +2,7 @@ #@NAME: HP Jornada 680 #@DESCRIPTION: Machine configuration for the HITACHI SH3 based HP Jornada 6xx palmtop computer -TARGET_ARCH = "sh" +TARGET_ARCH = "sh3" IPKG_ARCHS = "all ${TARGET_ARCH} ${MACHINE}" -PREFERRED_VERSION_glibc = "2.3.4" -PREFERRED_VERSION_glibc-initial = "2.3.4" include conf/machine/include/tune-sh3.conf -- cgit v1.2.3 From 6f0a42794ed574ba83f4a67ed0b9f9de079e758e Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 2 May 2006 18:20:08 +0000 Subject: lite5200.conf: remove stuff that should be in $DISTRO.conf --- conf/machine/lite5200.conf | 8 -------- 1 file changed, 8 deletions(-) diff --git a/conf/machine/lite5200.conf b/conf/machine/lite5200.conf index 8df7b51d69..68efccef32 100644 --- a/conf/machine/lite5200.conf +++ b/conf/machine/lite5200.conf @@ -1,18 +1,10 @@ TARGET_ARCH = "powerpc" -TARGET_OS = "linux" IPKG_ARCHS = "all ppc ${MACHINE}" UBOOT_MACHINE = "Lite5200" SERIAL_CONSOLE="38400 ttyS0" -DISTRO = "familiar" TARGET_PREFIX = powerpc-603e-linux-gnu- -ASSUME_PROVIDED += "virtual/${TARGET_PREFIX}gcc virtual/libc" -PREFERRED_PROVIDERS += "virtual/qte:qte virtual/libqpe:libqpe-opie" -PREFERRED_PROVIDERS += " virtual/libsdl:libsdl-qpe" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" -PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" IMAGE_FSTYPES = "jffs2 tar.bz2" -- cgit v1.2.3 From 3f77edde39cacd61aef016f48b1ac0e33105453d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 6 May 2006 10:07:26 +0000 Subject: angstrom 2006.9: slide cvsdate for hh-pxa kernel forward to get some bugfixes for hx4700 and h2200 machines --- conf/distro/angstrom-2006.9.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf index 1f1be076c9..c80a574a0d 100644 --- a/conf/distro/angstrom-2006.9.conf +++ b/conf/distro/angstrom-2006.9.conf @@ -15,6 +15,7 @@ FEED_URIS += " \ # updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/updates" SRCDATE = "20060425" +SRCDATE_handhelds-pxa-2.6 = "20060506" # Opie -- cgit v1.2.3 From 0d3454a64da518604fc4185eef1aa1ffe1c693e5 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Sat, 6 May 2006 12:32:14 +0000 Subject: zeroconf: add 0.9 --- packages/zeroconf/files/.mtn2git_empty | 0 packages/zeroconf/files/debian-zeroconf | 51 +++++++++++++++++++++++ packages/zeroconf/files/zeroconf-default | 17 ++++++++ packages/zeroconf/zeroconf-0.6.1/zeroconf-default | 17 -------- packages/zeroconf/zeroconf_0.9.bb | 21 ++++++++++ 5 files changed, 89 insertions(+), 17 deletions(-) create mode 100644 packages/zeroconf/files/.mtn2git_empty create mode 100644 packages/zeroconf/files/debian-zeroconf create mode 100644 packages/zeroconf/files/zeroconf-default delete mode 100644 packages/zeroconf/zeroconf-0.6.1/zeroconf-default create mode 100644 packages/zeroconf/zeroconf_0.9.bb diff --git a/packages/zeroconf/files/.mtn2git_empty b/packages/zeroconf/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/zeroconf/files/debian-zeroconf b/packages/zeroconf/files/debian-zeroconf new file mode 100644 index 0000000000..c3705d2788 --- /dev/null +++ b/packages/zeroconf/files/debian-zeroconf @@ -0,0 +1,51 @@ +#!/bin/sh + +if [ ! -x /usr/sbin/zeroconf ]; then + exit 0 +fi + +# IPv4 link-local addresses (zeroconf) are +# only applicable on the 'inet' address family +[ "X$ADDRFAM" != "Xinet" ] && exit 0 + +# However there are some methods where it doesn't +# make any sense to configure an IPv4LL address + +# not on loopback +[ "X$METHOD" = "Xloopback" ] && exit 0 + +# not on ppp or wvdial either +[ "X$METHOD" = "Xppp" ] && exit 0 +[ "X$METHOD" = "Xwvdial" ] && exit 0 + +# The administrator may have blacklisted interfaces +# or only want zeroconf in a fallback situation +[ -f /etc/default/zeroconf ] && + . /etc/default/zeroconf + +[ -n "$DISABLE" ] && exit 0 + +for BLACK in $IFBLACKLIST; do + case $IFACE in + $BLACK) + exit 0 + ;; + esac +done + +# should we only allocate an address if we do not already have one? +if [ -n "$FALLBACK" ]; then + /bin/ip addr show $IFACE scope global | grep -q "inet" + IP=$? + if [ $IP -eq 0 ]; then + /bin/ip route add 169.254.0.0/16 dev $IFACE + exit 0 + fi +fi + +# otherwise, run if we aren't already going +if [ ! -r /var/run/zeroconf.$IFACE.pid ]; then + /usr/sbin/zeroconf -i $IFACE +fi + +exit 0 diff --git a/packages/zeroconf/files/zeroconf-default b/packages/zeroconf/files/zeroconf-default new file mode 100644 index 0000000000..cc07b275f1 --- /dev/null +++ b/packages/zeroconf/files/zeroconf-default @@ -0,0 +1,17 @@ +# Default for zeroconf + +# disable zeroconf +# If you want to disable zeroconf completely, uncomment the following line +# this may be useful if you are debugging zeroconf or starting it manually +#DISABLE=yes + +# black-listed interfaces +# Interfaces which you never wish to have zeroconf run on should +# be listed here. e.g. "eth2 wlan1" in a space seperated string +IFBLACKLIST="" + +# fallback only +# If you would only like a link-local address if you were unable to +# obtain an address via DHCP then uncomment the following line +#FALLBACK=yes + diff --git a/packages/zeroconf/zeroconf-0.6.1/zeroconf-default b/packages/zeroconf/zeroconf-0.6.1/zeroconf-default deleted file mode 100644 index cc07b275f1..0000000000 --- a/packages/zeroconf/zeroconf-0.6.1/zeroconf-default +++ /dev/null @@ -1,17 +0,0 @@ -# Default for zeroconf - -# disable zeroconf -# If you want to disable zeroconf completely, uncomment the following line -# this may be useful if you are debugging zeroconf or starting it manually -#DISABLE=yes - -# black-listed interfaces -# Interfaces which you never wish to have zeroconf run on should -# be listed here. e.g. "eth2 wlan1" in a space seperated string -IFBLACKLIST="" - -# fallback only -# If you would only like a link-local address if you were unable to -# obtain an address via DHCP then uncomment the following line -#FALLBACK=yes - diff --git a/packages/zeroconf/zeroconf_0.9.bb b/packages/zeroconf/zeroconf_0.9.bb new file mode 100644 index 0000000000..c8f7ddfa3a --- /dev/null +++ b/packages/zeroconf/zeroconf_0.9.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "IPv4 link-local address allocator" +AUTHOR = "Anand Kumria " +HOMEPAGE = "http://www.progsoc.org/~wildfire/zeroconf/" +LICENSE = "GPL" +SECTION = "net" +PRIORITY = "optional" + +PR = "r0" + +SRC_URI = "http://www.progsoc.org/~wildfire/zeroconf/download/${PN}-${PV}.tar.gz \ + file://zeroconf-default \ + file://debian-zeroconf" + +do_install () { + install -d ${D}${sbindir} + install -d ${D}${sysconfdir}/network/if-up.d + install -d ${D}${sysconfdir}/default + install -c -m 755 ${S}/zeroconf ${D}${sbindir}/zeroconf + install -c -m 755 ${WORKDIR}/debian-zeroconf ${D}${sysconfdir}/network/if-up.d/zeroconf + install -c ${WORKDIR}/zeroconf-default ${D}${sysconfdir}/default/zeroconf +} -- cgit v1.2.3 From e1b98dd7d44d5d6bdb5c473ffe9158f03bbcfbd6 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Sat, 6 May 2006 13:15:38 +0000 Subject: avahi: bugfix release 0.6.10 - See http://avahi.org/milestone/Avahi%200.6.10 --- packages/avahi/avahi_0.6.10.bb | 54 ++++++++++++++++++++++++++++++++++++++++++ packages/avahi/avahi_0.6.9.bb | 54 ------------------------------------------ 2 files changed, 54 insertions(+), 54 deletions(-) create mode 100644 packages/avahi/avahi_0.6.10.bb delete mode 100644 packages/avahi/avahi_0.6.9.bb diff --git a/packages/avahi/avahi_0.6.10.bb b/packages/avahi/avahi_0.6.10.bb new file mode 100644 index 0000000000..95c930d8e8 --- /dev/null +++ b/packages/avahi/avahi_0.6.10.bb @@ -0,0 +1,54 @@ +DESCRIPTION = "Avahi implements the DNS-SD over Multicast DNS" +SECTION = "network" +PRIORITY = "optional" +AUTHOR = "Lennart Poettering " +HOMEPAGE = "http://avahi.org" +MAINTAINER = "Philipp Zabel " +LICENSE= "GPL" + +DEPENDS = "expat libdaemon dbus" +RRECOMMENDS = "libnss-mdns" + +SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz" + +PACKAGES = "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-dev avahi-doc avahi-utils" + +FILES_libavahi-common = "${libdir}/libavahi-common.so.*" +FILES_libavahi-core= "${libdir}/libavahi-core.so.*" +FILES_avahi-daemon = "${sbindir}/avahi-daemon \ + ${sysconfdir}/avahi/avahi-daemon.conf \ + ${sysconfdir}/avahi/hosts \ + ${sysconfdir}/avahi/services \ + ${sysconfdir}/dbus-1 \ + ${sysconfdir}/init.d/avahi-daemon \ + ${datadir}/avahi/introspection/*.introspect \ + ${datadir}/avahi/avahi-service.dtd \ + ${datadir}/avahi/service-types" +FILES_libavahi-client = "${libdir}/libavahi-client.so.*" +FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \ + ${sysconfdir}/avahi/avahi-dnsconfd.action \ + ${sysconfdir}/init.d/avahi-dnsconfd" +FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*" +FILES_avahi-utils = "${bindir}/avahi-*" + +CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf" + +EXTRA_OECONF = "--with-distro=debian --disable-gdbm --disable-gtk --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 --disable-python" +inherit autotools pkgconfig update-rc.d + +INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd" +INITSCRIPT_NAME_avahi-daemon = "avahi-daemon" +INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19" +INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd" +INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19" + +pkg_postinst_avahi-daemon () { + grep avahi /etc/group || addgroup avahi + grep avahi /etc/passwd || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi --ingroup avahi -g Avahi + /etc/init.d/dbus-1 force-reload +} + +pkg_postrm_avahi-daemon () { + deluser avahi || true + delgroup avahi || true +} diff --git a/packages/avahi/avahi_0.6.9.bb b/packages/avahi/avahi_0.6.9.bb deleted file mode 100644 index 95c930d8e8..0000000000 --- a/packages/avahi/avahi_0.6.9.bb +++ /dev/null @@ -1,54 +0,0 @@ -DESCRIPTION = "Avahi implements the DNS-SD over Multicast DNS" -SECTION = "network" -PRIORITY = "optional" -AUTHOR = "Lennart Poettering " -HOMEPAGE = "http://avahi.org" -MAINTAINER = "Philipp Zabel " -LICENSE= "GPL" - -DEPENDS = "expat libdaemon dbus" -RRECOMMENDS = "libnss-mdns" - -SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz" - -PACKAGES = "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-dev avahi-doc avahi-utils" - -FILES_libavahi-common = "${libdir}/libavahi-common.so.*" -FILES_libavahi-core= "${libdir}/libavahi-core.so.*" -FILES_avahi-daemon = "${sbindir}/avahi-daemon \ - ${sysconfdir}/avahi/avahi-daemon.conf \ - ${sysconfdir}/avahi/hosts \ - ${sysconfdir}/avahi/services \ - ${sysconfdir}/dbus-1 \ - ${sysconfdir}/init.d/avahi-daemon \ - ${datadir}/avahi/introspection/*.introspect \ - ${datadir}/avahi/avahi-service.dtd \ - ${datadir}/avahi/service-types" -FILES_libavahi-client = "${libdir}/libavahi-client.so.*" -FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \ - ${sysconfdir}/avahi/avahi-dnsconfd.action \ - ${sysconfdir}/init.d/avahi-dnsconfd" -FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*" -FILES_avahi-utils = "${bindir}/avahi-*" - -CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf" - -EXTRA_OECONF = "--with-distro=debian --disable-gdbm --disable-gtk --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 --disable-python" -inherit autotools pkgconfig update-rc.d - -INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd" -INITSCRIPT_NAME_avahi-daemon = "avahi-daemon" -INITSCRIPT_PARAMS_avahi-daemon = "defaults 21 19" -INITSCRIPT_NAME_avahi-dnsconfd = "avahi-dnsconfd" -INITSCRIPT_PARAMS_avahi-dnsconfd = "defaults 22 19" - -pkg_postinst_avahi-daemon () { - grep avahi /etc/group || addgroup avahi - grep avahi /etc/passwd || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi --ingroup avahi -g Avahi - /etc/init.d/dbus-1 force-reload -} - -pkg_postrm_avahi-daemon () { - deluser avahi || true - delgroup avahi || true -} -- cgit v1.2.3 From 017e0d534efae56a86e77aaaaa21b904b675f5e9 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 6 May 2006 15:57:21 +0000 Subject: libgpewidget: add 0.111 --- packages/libgpewidget/libgpewidget_0.111.bb | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 packages/libgpewidget/libgpewidget_0.111.bb diff --git a/packages/libgpewidget/libgpewidget_0.111.bb b/packages/libgpewidget/libgpewidget_0.111.bb new file mode 100644 index 0000000000..780d1e920b --- /dev/null +++ b/packages/libgpewidget/libgpewidget_0.111.bb @@ -0,0 +1,26 @@ +LICENSE = "LGPL" +DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications." +SECTION = "gpe/libs" +PRIORITY = "optional" +DEPENDS = "gtk+ cairo libxrender gtk-doc" +MAINTAINER = "Florian Boor " +PR = "r0" + +GPE_TARBALL_SUFFIX = "bz2" +inherit gpe pkgconfig autotools + +SRC_URI += "file://pkgconfig.patch;patch=1;pnum=0" + +PACKAGES =+ "libgpewidget-bin" +FILES_libgpewidget-bin = "${bindir}" + +EXTRA_OECONF = "--enable-cairo" + +PARALLEL_MAKE = "" + +LDFLAGS += " -L${STAGING_LIBDIR}" + +do_stage () { + autotools_stage_all +} + -- cgit v1.2.3 From 0e8a03ebe07638a2055dc2316cc43bf735a30a3f Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sat, 6 May 2006 16:54:45 +0000 Subject: qt3x11.bbclass: add DEPENDS on qt3 qt4x11.bbclass: add DEPENDS on qt4 --- classes/qt3x11.bbclass | 20 ++++++++++++-------- classes/qt4x11.bbclass | 25 +++++++++++++------------ 2 files changed, 25 insertions(+), 20 deletions(-) diff --git a/classes/qt3x11.bbclass b/classes/qt3x11.bbclass index 09b9cbac96..6e3d5f8ba2 100644 --- a/classes/qt3x11.bbclass +++ b/classes/qt3x11.bbclass @@ -1,11 +1,15 @@ +DEPENDS_prepend = "${@["qt3x11 ", ""][(bb.data.getVar('PN', d, 1) == 'qt-x11-free')]}" +EXTRA_QMAKEVARS_POST += "CONFIG+=thread" # # override variables set by qmake-base to compile Qt/X11 apps # -export QTDIR="${STAGING_DIR}/${HOST_SYS}/qt3" -export OE_QMAKE_UIC="${STAGING_BINDIR}/uic3" -export OE_QMAKE_MOC="${STAGING_BINDIR}/moc3" -export OE_QMAKE_CXXFLAGS="${CXXFLAGS} -DQT_NO_XIM" -export OE_QMAKE_INCDIR_QT="${QTDIR}/include" -export OE_QMAKE_LIBDIR_QT="${QTDIR}/lib" -export OE_QMAKE_LIBS_QT="qt" -export OE_QMAKE_LIBS_X11="-lXext -lX11 -lm" +export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt3" +export OE_QMAKE_UIC = "${STAGING_BINDIR}/uic3" +export OE_QMAKE_MOC = "${STAGING_BINDIR}/moc3" +export OE_QMAKE_CXXFLAGS = "${CXXFLAGS} -DQT_NO_XIM" +export OE_QMAKE_INCDIR_QT = "${QTDIR}/include" +export OE_QMAKE_LIBDIR_QT = "${QTDIR}/lib" +export OE_QMAKE_LIBS_QT = "qt" +export OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm" + + diff --git a/classes/qt4x11.bbclass b/classes/qt4x11.bbclass index 04aff565be..635fc67694 100644 --- a/classes/qt4x11.bbclass +++ b/classes/qt4x11.bbclass @@ -1,16 +1,17 @@ DEPENDS_prepend = "qmake2-native " +DEPENDS_prepend = "${@["qt4x11 ", ""][(bb.data.getVar('PN', d, 1) == 'qt4-x11-free')]}" # # override variables set by qmake-base to compile Qt4/X11 apps # -export QTDIR="${STAGING_DIR}/${HOST_SYS}/qt4" -export QMAKESPEC="${QTDIR}/mkspecs/${TARGET_OS}-oe-g++" -export OE_QMAKE_UIC="${STAGING_BINDIR}/uic4" -export OE_QMAKE_MOC="${STAGING_BINDIR}/moc4" -export OE_QMAKE_RCC="${STAGING_BINDIR}/rcc4" -export OE_QMAKE_QMAKE="${STAGING_BINDIR}/qmake2" -export OE_QMAKE_LINK="${CXX}" -export OE_QMAKE_CXXFLAGS="${CXXFLAGS}" -export OE_QMAKE_INCDIR_QT="${QTDIR}/include" -export OE_QMAKE_LIBDIR_QT="${QTDIR}/lib" -export OE_QMAKE_LIBS_QT="qt" -export OE_QMAKE_LIBS_X11="-lXext -lX11 -lm" +export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt4" +export QMAKESPEC = "${QTDIR}/mkspecs/${TARGET_OS}-oe-g++" +export OE_QMAKE_UIC = "${STAGING_BINDIR}/uic4" +export OE_QMAKE_MOC = "${STAGING_BINDIR}/moc4" +export OE_QMAKE_RCC = "${STAGING_BINDIR}/rcc4" +export OE_QMAKE_QMAKE = "${STAGING_BINDIR}/qmake2" +export OE_QMAKE_LINK = "${CXX}" +export OE_QMAKE_CXXFLAGS = "${CXXFLAGS}" +export OE_QMAKE_INCDIR_QT = "${QTDIR}/include" +export OE_QMAKE_LIBDIR_QT = "${QTDIR}/lib" +export OE_QMAKE_LIBS_QT = "qt" +export OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm" -- cgit v1.2.3 From 4588de1cde5001a58577d246187a6d77d69f38d2 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sat, 6 May 2006 16:55:40 +0000 Subject: libqanava, lyx, texmaker, wpa-gui: no need to explicitly depend on qt, inheriting will do --- packages/libqanava/libqanava_0.0.7.bb | 1 - packages/lyx/lyx_1.4.0.bb | 2 +- packages/lyx/lyx_1.4.1.bb | 2 +- packages/texmaker/texmaker_1.3.bb | 1 - packages/wpa-supplicant/wpa-gui_0.4.8.bb | 3 +-- 5 files changed, 3 insertions(+), 6 deletions(-) diff --git a/packages/libqanava/libqanava_0.0.7.bb b/packages/libqanava/libqanava_0.0.7.bb index 8562a5f112..13ab88c3d2 100644 --- a/packages/libqanava/libqanava_0.0.7.bb +++ b/packages/libqanava/libqanava_0.0.7.bb @@ -2,7 +2,6 @@ DESCRIPTION = "Qanava is a gtaph library based on the Qt4 Arthur framework." SECTION = "x11/libs" HOMEPAGE = "http://www.libqanava.org/" MAINTAINER = "Michael 'Mickey' Lauer " -DEPENDS = "qt4x11" # LGPL after 0.0.7 LICENSE = "GPL" PR = "r0" diff --git a/packages/lyx/lyx_1.4.0.bb b/packages/lyx/lyx_1.4.0.bb index b3f6a2c7ad..644d8bfa73 100644 --- a/packages/lyx/lyx_1.4.0.bb +++ b/packages/lyx/lyx_1.4.0.bb @@ -3,7 +3,7 @@ SECTION = "x11/office" LICENSE = "GPL" HOMEPAGE = "http://www.lyx.org" MAINTAINER = "Michael 'Mickey' Lauer " -DEPENDS = "boost qt3x11" +DEPENDS = "boost" RRECOMMENDS = "tetex" PR = "r0" diff --git a/packages/lyx/lyx_1.4.1.bb b/packages/lyx/lyx_1.4.1.bb index 0cd925ad50..59dc35f0ff 100644 --- a/packages/lyx/lyx_1.4.1.bb +++ b/packages/lyx/lyx_1.4.1.bb @@ -3,7 +3,7 @@ SECTION = "x11/office" LICENSE = "GPL" HOMEPAGE = "http://www.lyx.org" MAINTAINER = "Michael 'Mickey' Lauer " -DEPENDS = "boost qt3x11" +DEPENDS = "boost" RRECOMMENDS = "tetex" PR = "r0" diff --git a/packages/texmaker/texmaker_1.3.bb b/packages/texmaker/texmaker_1.3.bb index 0ca09032cb..34704ba111 100644 --- a/packages/texmaker/texmaker_1.3.bb +++ b/packages/texmaker/texmaker_1.3.bb @@ -2,7 +2,6 @@ DESCRIPTION = "TeXmaker is a free cross-platform LaTeX editor" HOMEPAGE = "http://www.xm1math.net/texmaker" SECTION = "x11/apps" LICENSE = "GPL" -DEPENDS = "qt4x11" MAINTAINER = "Michael 'Mickey' Lauer " SRC_URI = "http://www.xm1math.net/texmaker/texmaker-${PV}.tar.bz2" diff --git a/packages/wpa-supplicant/wpa-gui_0.4.8.bb b/packages/wpa-supplicant/wpa-gui_0.4.8.bb index 0908a5c995..686545a148 100644 --- a/packages/wpa-supplicant/wpa-gui_0.4.8.bb +++ b/packages/wpa-supplicant/wpa-gui_0.4.8.bb @@ -5,6 +5,7 @@ edit wpa_supplicant networks." SECTION = "network" LICENSE = "GPL BSD" HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/" +PR = "r1" SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz " @@ -12,8 +13,6 @@ S = "${WORKDIR}/wpa_supplicant-${PV}/wpa_gui/" inherit qmake qt3x11 -EXTRA_QMAKEVARS_POST += "CONFIG+=thread" - do_install () { install -d ${D}${sbindir} install -m 755 wpa_gui ${D}${sbindir} -- cgit v1.2.3 From b7c0b97dec8d44496972003a3258654945872d29 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 6 May 2006 17:52:09 +0000 Subject: zaurusd: Use our own copy of zaurus-hinge.in instead of patching. Clean up the .bb a bit. --- .../files/mbinputmgr-honor-user-prefs.patch | 65 ---------------- packages/zaurusd/files/zaurus-hinge.in | 91 ++++++++++++++++++++++ packages/zaurusd/zaurusd_svn.bb | 17 ++-- 3 files changed, 101 insertions(+), 72 deletions(-) delete mode 100644 packages/zaurusd/files/mbinputmgr-honor-user-prefs.patch create mode 100644 packages/zaurusd/files/zaurus-hinge.in diff --git a/packages/zaurusd/files/mbinputmgr-honor-user-prefs.patch b/packages/zaurusd/files/mbinputmgr-honor-user-prefs.patch deleted file mode 100644 index e2d56874c9..0000000000 --- a/packages/zaurusd/files/mbinputmgr-honor-user-prefs.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- zaurusd/scripts/zaurus-hinge.in 2006-03-24 18:23:15.000000000 +0100 -+++ zaurusd/scripts/zaurus-hinge 2006-03-24 18:33:24.480748696 +0100 -@@ -18,6 +18,10 @@ - exit 1 - fi - -+panel_user="`ps aux|grep matchbox-panel|grep -v grep | awk '{print $2}'`" -+ -+ -+ - STATE=$1 - - if [ $STATE = "3" ]; then -@@ -29,8 +33,21 @@ - fi - - if [ $STATE = "0" ]; then -- #echo "lanscape" -- killproc @bindir@/mbinputmgr -+ #echo "landscape" -+ -+ # As matchbox-panel updates its written configuration right after an applet dies / is killed, we can not be sure -+ # whether the user had gpe-panel in his preferences after rotating to portrait. And since there is a slim chance -+ # that a user changes his preferences from time to time, we renew that dumped configuration every now and then ;) -+ -+ if ! test -e "/tmp/gpe-panel.session-$panel_user" -+ then -+ test -e /home/$panel_user/.matchbox/mbdock.session && cp /home/$panel_user/.matchbox/mbdock.session "/tmp/gpe-panel.session-$panel_user" -+ test -e "/tmp/gpe-panel.session-$panel_user" && cat "/tmp/gpe-panel.session-$panel_user" | grep -q panel || killproc @bindir@/mbinputmgr -+ else -+ cat "/tmp/gpe-panel.session-$panel_user" | grep -q panel || killproc @bindir@/mbinputmgr -+ rm "/tmp/gpe-panel.session-$panel_user" -+ fi -+ - # urg mbinputmgr should kill below - killproc @bindir@/matchbox-keyboard - killproc @bindir@/matchbox-stroke -@@ -47,8 +64,25 @@ - fi - # just to be extra safe - sleep 1 -- if [ -x @bindir@/mbinputmgr ]; then -- @bindir@/mbinputmgr & -+ -+ echo "panel_user = [$panel_user]" -+ -+ if ! test -e "/tmp/gpe-panel.session-$panel_user" -+ then -+ cp /home/$panel_user/.matchbox/mbdock.session "/tmp/gpe-panel.session-$panel_user" -+ else -+ rm "/tmp/gpe-panel.session-$panel_user" - fi -+ -+ if test -n "$panel_user" -+ then -+ echo "Running panel as user [$panel_user]" -+ ps aux | grep "$panel_user" | grep -q "mbinputmgr " || su $panel_user -c @bindir@/mbinputmgr & -+ else -+ # A failsafe can't hurt -+ echo "Warning: Running mbinputmgr as root!" -+ ps aux | grep -q "mbinputmgr " || @bindir@/mbinputmgr & -+ fi -+ - exit 0 - fi diff --git a/packages/zaurusd/files/zaurus-hinge.in b/packages/zaurusd/files/zaurus-hinge.in new file mode 100644 index 0000000000..1d4682e603 --- /dev/null +++ b/packages/zaurusd/files/zaurus-hinge.in @@ -0,0 +1,91 @@ +#!/bin/sh +# +# Quick handler for chkhinge26 and X. +# + +killproc() { # kill the named process(es) + pid=`/bin/ps -e x | + /bin/grep $1 | + /bin/grep -v grep | + /bin/sed -e 's/^ *//' -e 's/ .*//'` + [ "$pid" != "" ] && kill $pid +} + +export DISPLAY=:0 + +if [ -z "$1" ]; then + echo "Usage: hinge-handler ( 3 = closed, 0 = landscape, 2 = portrait )" + exit 1 +fi + +panel_user="`ps aux|grep matchbox-panel|grep -v grep | awk '{print $2}'`" + + + +STATE=$1 + +if [ $STATE = "3" ]; then + #echo "sleeping" +# +# uncomment 'if' block below to have zaurus suspend on hinge close +# +# if [ -x @bindir@/apm ]; then +# apm -s +# fi + exit 0 +fi + +if [ $STATE = "0" ]; then + #echo "landscape" + + # As matchbox-panel updates its written configuration right after an applet dies / is killed, we can not be sure + # whether the user had gpe-panel in his preferences after rotating to portrait. And since there is a slim chance + # that a user changes his preferences from time to time, we renew that dumped configuration every now and then ;) + + if ! test -e "/tmp/gpe-panel.session-$panel_user" + then + test -e /home/$panel_user/.matchbox/mbdock.session && cp /home/$panel_user/.matchbox/mbdock.session "/tmp/gpe-panel.session-$panel_user" + test -e "/tmp/gpe-panel.session-$panel_user" && cat "/tmp/gpe-panel.session-$panel_user" | grep -q panel || killproc @bindir@/mbinputmgr + else + cat "/tmp/gpe-panel.session-$panel_user" | grep -q panel || killproc @bindir@/mbinputmgr + rm "/tmp/gpe-panel.session-$panel_user" + fi + + # urg mbinputmgr should kill below + killproc @bindir@/matchbox-keyboard + killproc @bindir@/matchbox-stroke + if [ -x @bindir@/xrandr ]; then + xrandr -o normal + fi + exit 0 +fi + +if [ $STATE = "2" ]; then + #echo "portrait" + if [ -x @bindir@/xrandr ]; then + @bindir@/xrandr -o left + fi + # just to be extra safe + sleep 1 + + echo "panel_user = [$panel_user]" + + if ! test -e "/tmp/gpe-panel.session-$panel_user" + then + cp /home/$panel_user/.matchbox/mbdock.session "/tmp/gpe-panel.session-$panel_user" + else + rm "/tmp/gpe-panel.session-$panel_user" + fi + + if test -n "$panel_user" + then + echo "Running panel as user [$panel_user]" + ps aux | grep "$panel_user" | grep -q "mbinputmgr " || su $panel_user -c @bindir@/mbinputmgr & + else + # A failsafe can't hurt + echo "Warning: Running mbinputmgr as root!" + ps aux | grep -q "mbinputmgr " || @bindir@/mbinputmgr & + fi + + exit 0 +fi diff --git a/packages/zaurusd/zaurusd_svn.bb b/packages/zaurusd/zaurusd_svn.bb index 52a7b353d3..ec385d4934 100644 --- a/packages/zaurusd/zaurusd_svn.bb +++ b/packages/zaurusd/zaurusd_svn.bb @@ -1,20 +1,23 @@ -LICENSE = "GPL" +DESCRIPTION = "Daemon to handle device specifc features." SECTION = "base" MAINTAINER = "Richard Purdie " -DESCRIPTION = "Daemon to handle device specifc features." -PV = "0.0+svn${SRCDATE}" -PR = "r2" +LICENSE = "GPL" DEPENDS = "tslib" +PV = "0.0+svn${SRCDATE}" +PR = "r4" SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \ - file://mbinputmgr-honor-user-prefs.patch;patch=1" + file://zaurus-hinge.in" + S = "${WORKDIR}/${PN}" PACKAGE_ARCH = "${MACHINE_ARCH}" -inherit autotools pkgconfig +do_configure_prepend () { + cp ${WORKDIR}/zaurus-hinge.in ${S}/scripts +} -inherit update-rc.d +inherit autotools pkgconfig update-rc.d INITSCRIPT_NAME = "zaurusd" INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ." -- cgit v1.2.3 From dae79b434ee64cc19d09eb27d0adb61cd5dd282d Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Sat, 6 May 2006 21:17:02 +0000 Subject: slugos-packages.conf: added dhcp (includes dhclient) --- conf/distro/slugos-packages.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/distro/slugos-packages.conf b/conf/distro/slugos-packages.conf index 87ca470069..784bc5d8fd 100644 --- a/conf/distro/slugos-packages.conf +++ b/conf/distro/slugos-packages.conf @@ -41,6 +41,7 @@ ${PKGDIR}/packages/dbus/*.bb \ ${PKGDIR}/packages/devio/*.bb \ ${PKGDIR}/packages/device-mapper/*.bb \ ${PKGDIR}/packages/devlabel/*.bb \ +${PKGDIR}/packages/dhcp/*.bb \ ${PKGDIR}/packages/didiwiki/*.bb \ ${PKGDIR}/packages/diffstat/*.bb \ ${PKGDIR}/packages/diffutils/*.bb \ -- cgit v1.2.3 From c0d6211841a0da37a2e92ca603630fee633732bf Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sat, 6 May 2006 22:32:48 +0000 Subject: add ulxmlrpcpp, a lightweight c++ based library for XMLRPC applications --- packages/ulxmlrpcpp/.mtn2git_empty | 0 packages/ulxmlrpcpp/files/.mtn2git_empty | 0 packages/ulxmlrpcpp/files/disable-docs.patch | 15 +++++++++++++++ packages/ulxmlrpcpp/ulxmlrpcpp_1.5.2.bb | 23 +++++++++++++++++++++++ 4 files changed, 38 insertions(+) create mode 100644 packages/ulxmlrpcpp/.mtn2git_empty create mode 100644 packages/ulxmlrpcpp/files/.mtn2git_empty creat