From 54de21ef73e5d526b647c21fed94cd2283a68be7 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 18 Dec 2006 12:40:11 +0000 Subject: apr 1.2.7: stage all --- packages/apr/apr_1.2.7.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/apr/apr_1.2.7.bb b/packages/apr/apr_1.2.7.bb index 6374949f91..2016ca0126 100644 --- a/packages/apr/apr_1.2.7.bb +++ b/packages/apr/apr_1.2.7.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Apache Portable Runtime (APR) library" SECTION = "libs" LICENSE = "Apache License, Version 2.0" -PR = "r0" +PR = "r1" # apache mirrors? SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.bz2" @@ -14,5 +14,5 @@ do_configure() { } do_stage() { - oe_libinstall -a -so -C .libs libapr-1 ${STAGING_LIBDIR} + autotools_stage_all } -- cgit v1.2.3 From 9e6de6bbf2e11a7fd9dcd6d413ab44b514eeeb13 Mon Sep 17 00:00:00 2001 From: Stelios Koroneos Date: Tue, 19 Dec 2006 19:20:05 +0000 Subject: Fix typo in system restricted packages --- classes/icecc.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/icecc.bbclass b/classes/icecc.bbclass index cf1ab630fa..5fadee4ab6 100644 --- a/classes/icecc.bbclass +++ b/classes/icecc.bbclass @@ -253,7 +253,7 @@ def icc_path(bb,d,compile): #"system" package blacklist contains a list of packages that can not distribute compile tasks #for one reason or the other - system_package_blacklist = [ "ulibc", "glibc", "qemu" ] + system_package_blacklist = [ "uclibc", "glibc", "qemu" ] for black in system_package_blacklist: if black in package_tmp: -- cgit v1.2.3 From 4ae75ddfdeecbf753c31a2eac69e411ce45910fa Mon Sep 17 00:00:00 2001 From: Stelios Koroneos Date: Tue, 19 Dec 2006 19:49:56 +0000 Subject: Point to correct dir containing kernel headers --- packages/uclibc/uclibc_svn.bb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/uclibc/uclibc_svn.bb b/packages/uclibc/uclibc_svn.bb index ef9c40d463..568f8d46ee 100644 --- a/packages/uclibc/uclibc_svn.bb +++ b/packages/uclibc/uclibc_svn.bb @@ -21,9 +21,10 @@ PROVIDES += "virtual/${TARGET_PREFIX}libc-for-gcc" PACKAGE_ARCH = "${MACHINE_ARCH}" FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-cvs', '${FILE_DIRNAME}/uclibc-${UCLIBC_BASE}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" -#as stated above, uclibc needs real kernel-headers -#however: we can't depend on virtual/kernel when nptl hits due to depends deadlocking .... -KERNEL_SOURCE = "${STAGING_KERNEL_DIR}" +# This is the correct KERNEL_SOURCE location, if the uClibc +# fix_includes.sh script is run (see nokernelheader.patch below) +# this must be correct. +KERNEL_SOURCE = "${CROSS_DIR}/${TARGET_SYS}" SRC_URI += "svn://uclibc.org/trunk;module=uClibc" -- cgit v1.2.3 From 1a17de4b86cf86f6a92b2119a83da5c21587f1c4 Mon Sep 17 00:00:00 2001 From: Stelios Koroneos Date: Tue, 19 Dec 2006 19:53:26 +0000 Subject: Initial commit for a powerpc-uclibc site file *needs clearing up* --- site/powerpc-linux-uclibc | 200 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 200 insertions(+) create mode 100644 site/powerpc-linux-uclibc diff --git a/site/powerpc-linux-uclibc b/site/powerpc-linux-uclibc new file mode 100644 index 0000000000..aa9fd6bba3 --- /dev/null +++ b/site/powerpc-linux-uclibc @@ -0,0 +1,200 @@ +ac_cv_func_getpgrp_void=yes +ac_cv_func_setpgrp_void=yes +ac_cv_func_setgrent_void=yes +ac_cv_func_malloc_0_nonnull=yes +ac_cv_func_malloc_works=yes +ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes} +ac_cv_func_setvbuf_reversed=no +ac_cv_sizeof___int64=${ac_cv_sizeof___int64=0} +ac_cv_sizeof_char=${ac_cv_sizeof_char=1} +ac_cv_sizeof_int=${ac_cv_sizeof_int=4} +ac_cv_sizeof_long=${ac_cv_sizeof_long=4} +ac_cv_sizeof_long_int=${ac_cv_sizeof_long_int=4} +ac_cv_sizeof_long_long=${ac_cv_sizeof_long_long=8} +ac_cv_sizeof_short=${ac_cv_sizeof_short=2} +ac_cv_sizeof_short_int=${ac_cv_sizeof_short_int=2} +ac_cv_sizeof_size_t=${ac_cv_sizeof_size_t=4} +ac_cv_sizeof_void_p=${ac_cv_sizeof_void_p=4} +ac_cv_sizeof_long_double=${ac_cv_sizeof_long_double=8} + +ac_cv_sys_restartable_syscalls=yes +ac_cv_type___int64=${ac_cv_type___int64=no} +ac_cv_type_size_t=${ac_cv_type_size_t=yes} +ac_cv_type_void_p=${ac_cv_type_void_p=yes} +ac_cv_uchar=${ac_cv_uchar=no} +ac_cv_uint=${ac_cv_uint=yes} +ac_cv_ulong=${ac_cv_ulong=yes} +ac_cv_ushort=${ac_cv_ushort=yes} + +mr_cv_target_elf=${mr_cv_target_elf=yes} + +ac_cv_c_littleendian=${ac_cv_c_littleendian=no} +ac_cv_c_bigendian=${ac_cv_c_bigendian=yes} +ac_cv_time_r_type=${ac_cv_time_r_type=POSIX} +cookie_io_functions_use_off64_t=${cookie_io_functions_use_off64_t=yes} + + +# apache +ac_cv_func_pthread_key_delete=${ac_cv_func_pthread_key_delete=yes} +apr_cv_process_shared_works=${apr_cv_process_shared_works=no} +ac_cv_sizeof_ssize_t=${ac_cv_sizeof_ssize_t=4} + +ac_cv_header_netinet_sctp_h=${ac_cv_header_netinet_sctp_h=no} +ac_cv_header_netinet_sctp_uio_h=${ac_cv_header_netinet_sctp_uio_h=no} +ac_cv_sctp=${ac_cv_sctp=no} + +# ssh +ac_cv_have_space_d_name_in_struct_dirent=${ac_cv_dirent_have_space_d_name=yes} +ac_cv_have_broken_snprintf=${ac_cv_have_broken_snprintf=no} +ac_cv_have_accrights_in_msghdr=${ac_cv_have_accrights_in_msghdr=no} +ac_cv_have_control_in_msghdr=${ac_cv_have_control_in_msghdr=yes} +ac_cv_type_struct_timespec=${ac_cv_type_struct_timespec=yes} +ac_cv_have_openpty_ctty_bug=${ac_cv_have_openpty_ctty_bug=yes} + +# coreutils +utils_cv_sys_open_max=${utils_cv_sys_open_max=1019} + +# libpcap +ac_cv_linux_vers=${ac_cv_linux_vers=2} + +# nano +ac_cv_regexec_segfault_emptystr=${ac_cv_regexec_segfault_emptystr=no} +nano_cv_func_regexec_segv_emptystr=${nano_cv_func_regexec_segv_emptystr=no} + +# libnet +ac_cv_libnet_endianess=${ac_cv_libnet_endianess=big} + + + +# socat +ac_cv_ispeed_offset=${ac_cv_ispeed_offset=13} +sc_cv_termios_ispeed=${sc_cv_termios_ispeed=yes} + +# links +ac_cv_lib_png_png_create_info_struct=${ac_cv_lib_png_png_create_info_struct=yes} + +# sleepycat db +db_cv_fcntl_f_setfd=${db_cv_fcntl_f_setfd=yes} +db_cv_sprintf_count=${db_cv_sprintf_count=yes} +db_cv_path_ar=${db_cv_path_ar=/usr/bin/ar} +db_cv_path_chmod=${db_cv_path_chmod=/bin/chmod} +db_cv_path_cp=${db_cv_path_cp=/bin/cp} +db_cv_path_ln=${db_cv_path_ln=/bin/ln} +db_cv_path_mkdir=${db_cv_path_mkdir=/bin/mkdir} +db_cv_path_ranlib=${db_cv_path_ranlib=/usr/bin/ranlib} +db_cv_path_rm=${db_cv_path_rm=/bin/rm} +db_cv_path_sh=${db_cv_path_sh=/bin/sh} +db_cv_path_strip=${db_cv_path_strip=/usr/bin/strip} +db_cv_align_t=${db_cv_align_t='unsigned long long'} +db_cv_alignp_t=${db_cv_alignp_t='unsigned long'} +db_cv_mutex=${db_cv_mutex=no} +db_cv_posixmutexes=${db_cv_posixmutexes=no} +db_cv_uimutexes=${db_cv_uimutexes=no} + +# php +ac_cv_pread=${ac_cv_pread=no} +ac_cv_pwrite=${ac_cv_pwrite=no} +php_cv_lib_cookie_io_functions_use_off64_t=${php_cv_lib_cookie_io_functions_use_off64_t=yes} + + +# ettercap +ettercap_cv_type_socklen_t=${ettercap_cv_type_socklen_t=yes} + +# libesmtp +acx_working_snprintf=${acx_working_snprintf=yes} + +# D-BUS +ac_cv_func_posix_getpwnam_r=${ac_cv_func_posix_getpwnam_r=yes} + +# glib 2.0 +glib_cv_long_long_format=${glib_cv_long_long_format=ll} +glib_cv_sizeof_gmutex=${glib_cv_sizeof_gmutex=24} +glib_cv_sizeof_intmax_t=${glib_cv_sizeof_intmax_t=8} +glib_cv_sizeof_ptrdiff_t=${glib_cv_sizeof_ptrdiff_t=4} +glib_cv_sizeof_size_t=${glib_cv_sizeof_size_t=4} +glib_cv_sizeof_system_thread=${glib_cv_sizeof_system_thread=4} +glib_cv_sys_use_pid_niceness_surrogate=${glib_cv_sys_use_pid_niceness_surrogate=yes} + +glib_cv_strlcpy=${glib_cv_strlcpy=no} + +# httppc +ac_cv_strerror_r_SUSv3=${ac_cv_strerror_r_SUSv3=no} + +# lftp +ac_cv_need_trio=${ac_cv_need_trio=no} +lftp_cv_va_copy=${lftp_cv_va_copy=no} +lftp_cv_va_val_copy=${lftp_cv_va_val_copy=yes} +lftp_cv___va_copy=${lftp_cv___va_copy=yes} + +# edb +db_cv_spinlocks=${db_cv_spinlocks=no} + +# fget +compat_cv_func_snprintf_works=${compat_cv_func_snprintf_works=yes} +compat_cv_func_basename_works=${compat_cv_func_basename_works=no} +compat_cv_func_dirname_works=${compat_cv_func_dirname_works=no} + +# slrn +slrn_cv___va_copy=${slrn_cv___va_copy=yes} +slrn_cv_va_copy=${slrn_cv_va_copy=no} +slrn_cv_va_val_copy=${slrn_cv_va_val_copy=yes} +ac_cv_func_realloc_works=${ac_cv_func_realloc_works=yes} +ac_cv_func_realloc_0_nonnull=${ac_cv_func_realloc_0_nonnull=yes} +ac_cv_func_malloc_works=${ac_cv_func_malloc_works=yes} +ac_cv_func_malloc_0_nonnull=${ac_cv_func_malloc_0_nonnull=yes} + +# startup-notification +lf_cv_sane_realloc=yes + +# libidl +libIDL_cv_long_long_format=${libIDL_cv_long_long_format=ll} + +# ORBit2 +ac_cv_alignof_CORBA_boolean=1 +ac_cv_alignof_CORBA_char=1 +ac_cv_alignof_CORBA_double=4 +ac_cv_alignof_CORBA_float=4 +ac_cv_alignof_CORBA_long=4 +ac_cv_alignof_CORBA_long_double=4 +ac_cv_alignof_CORBA_long_long=4 +ac_cv_alignof_CORBA_octet=1 +ac_cv_alignof_CORBA_pointer=4 +ac_cv_alignof_CORBA_short=2 +ac_cv_alignof_CORBA_struct=4 +ac_cv_alignof_CORBA_wchar=2 +ac_cv_func_getaddrinfo=${ac_cv_func_getaddrinfo=yes} + +# cvs +cvs_cv_func_printf_ptr=${cvs_cv_func_printf_ptr=yes} + +# bash +ac_cv_c_long_double=${ac_cv_c_long_double=yes} +bash_cv_have_mbstate_t=${bash_cv_have_mbstate_t=yes} +bash_cv_func_sigsetjmp=${bash_cv_func_sigsetjmp=missing} +bash_cv_must_reinstall_sighandlers=${bash_cv_must_reinstall_sighandlers=no} +bash_cv_func_strcoll_broken=${bash_cv_func_strcoll_broken=no} +bash_cv_under_sys_siglist=${bash_cv_under_sys_siglist=yes} +bash_cv_sys_siglist=${bash_cv_sys_siglist=yes} +bash_cv_dup2_broken=${bash_cv_dup2_broken=no} +bash_cv_opendir_not_robust=${bash_cv_opendir_not_robust=no} +bash_cv_type_rlimit=${bash_cv_type_rlimit=rlim_t} +bash_cv_getenv_redef=${bash_cv_getenv_redef=yes} +bash_cv_ulimit_maxfds=${bash_cv_ulimit_maxfds=yes} +bash_cv_getcwd_calls_popen=${bash_cv_getcwd_calls_popen=no} +bash_cv_printf_a_format=${bash_cv_printf_a_format=yes} +bash_cv_pgrp_pipe=${bash_cv_pgrp_pipe=no} +bash_cv_job_control_missing=${bash_cv_job_control_missing=present} +bash_cv_sys_named_pipes=${bash_cv_sys_named_pipes=present} +bash_cv_unusable_rtsigs=${bash_cv_unusable_rtsigs=no} +ac_cv_have_decl_sys_siglist=${ac_cv_have_decl_sys_siglist=yes} + +# openssh +ac_cv_have_broken_dirname=${ac_cv_have_broken_dirname='yes'} +ac_cv_have_space_d_name_in_struct_dirent=${ac_cv_have_space_d_name_in_struct_dirent='no'} +ac_cv_have_broken_snprintf=${ac_cv_have_broken_snprintf='no'} +ac_cv_have_openpty_ctty_bug=${ac_cv_have_openpty_ctty_bug='yes'} +ac_cv_have_accrights_in_msghdr=${ac_cv_have_accrights_in_msghdr='no'} +ac_cv_have_control_in_msghdr=${ac_cv_have_control_in_msghdr='yes'} + +# vim +ac_cv_sizeof_int=${ac_cv_sizeof_int='4'} -- cgit v1.2.3 From 24b5de89da4f45465f88dada33d6563a96a5659f Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 19 Dec 2006 22:16:03 +0000 Subject: efl++: remove 0.1.0 version (no longer fetchable) --- packages/efl++/efl++-fb_0.1.0.bb | 1 - packages/efl++/efl++-x11_0.1.0.bb | 3 --- 2 files changed, 4 deletions(-) delete mode 100644 packages/efl++/efl++-fb_0.1.0.bb delete mode 100644 packages/efl++/efl++-x11_0.1.0.bb diff --git a/packages/efl++/efl++-fb_0.1.0.bb b/packages/efl++/efl++-fb_0.1.0.bb deleted file mode 100644 index a2e3a7dd34..0000000000 --- a/packages/efl++/efl++-fb_0.1.0.bb +++ /dev/null @@ -1 +0,0 @@ -require efl++.inc diff --git a/packages/efl++/efl++-x11_0.1.0.bb b/packages/efl++/efl++-x11_0.1.0.bb deleted file mode 100644 index 7f6c942790..0000000000 --- a/packages/efl++/efl++-x11_0.1.0.bb +++ /dev/null @@ -1,3 +0,0 @@ -require efl++.inc - -EXTRA_QMAKEVARS_POST += "CONFIG+=eflecorex11" -- cgit v1.2.3 From f8802750ea8b07879d8ebb4eed329e7a468a134a Mon Sep 17 00:00:00 2001 From: Shane Volpe Date: Wed, 20 Dec 2006 13:40:16 +0000 Subject: portmap: do not use strip - close #1702 --- packages/portmap/portmap-5-24/make.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/portmap/portmap-5-24/make.patch b/packages/portmap/portmap-5-24/make.patch index 6dacd828c6..7726846b7c 100644 --- a/packages/portmap/portmap-5-24/make.patch +++ b/packages/portmap/portmap-5-24/make.patch @@ -53,9 +53,9 @@ Index: portmap_5beta/Makefile + install -d $(DESTDIR)/$(sbindir) \ + $(DESTDIR)/$(docdir) \ + $(DESTDIR)/$(mandir)/man8 -+ install -m 0755 -s portmap ${DESTDIR}/sbin -+ install -m 0755 -s pmap_dump ${DESTDIR}/sbin -+ install -m 0755 -s pmap_set ${DESTDIR}/sbin ++ install -m 0755 portmap ${DESTDIR}/sbin ++ install -m 0755 pmap_dump ${DESTDIR}/sbin ++ install -m 0755 pmap_set ${DESTDIR}/sbin + install -m 0644 portmap.8 ${DESTDIR}/usr/share/man/man8 + install -m 0644 pmap_dump.8 ${DESTDIR}/usr/share/man/man8 + install -m 0644 pmap_set.8 ${DESTDIR}/usr/share/man/man8 -- cgit v1.2.3 From a3ec6e7cce0cd654381330b94931368595c8e216 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 20 Dec 2006 14:18:07 +0000 Subject: mono: dropped - not fetchable, not maintained --- packages/mono/.mtn2git_empty | 0 packages/mono/files/.mtn2git_empty | 0 packages/mono/files/install-lossage.patch | 13 ------------- packages/mono/files/libtool-lossage.patch | 7 ------- packages/mono/mono-native_1.0.bb | 6 ------ packages/mono/mono_1.0.bb | 18 ------------------ 6 files changed, 44 deletions(-) delete mode 100644 packages/mono/.mtn2git_empty delete mode 100644 packages/mono/files/.mtn2git_empty delete mode 100644 packages/mono/files/install-lossage.patch delete mode 100644 packages/mono/files/libtool-lossage.patch delete mode 100644 packages/mono/mono-native_1.0.bb delete mode 100644 packages/mono/mono_1.0.bb diff --git a/packages/mono/.mtn2git_empty b/packages/mono/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/mono/files/.mtn2git_empty b/packages/mono/files/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/mono/files/install-lossage.patch b/packages/mono/files/install-lossage.patch deleted file mode 100644 index 51fcdbbe85..0000000000 --- a/packages/mono/files/install-lossage.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- mono-1.0/runtime/net_1_1/Makefile.am.old 2004-07-21 20:30:21.101405400 +0100 -+++ mono-1.0/runtime/net_1_1/Makefile.am 2004-07-21 20:31:05.209699920 +0100 -@@ -91,8 +91,8 @@ - @if test -n '$(gac_assemblies)'; then \ - for i in ''$(gac_assemblies); do \ - echo "MONO_PATH=$(srcdir) $(mono_runtime) --config ../../data/config $(gacutil) /i $(srcdir)/$$i /f /package 1.0 /gacdir $(GAC_DIR) /root $(GAC_ROOT_DIR)" ; \ -- MONO_PATH=$(srcdir) \ -- $(LIBTOOL) --mode=execute $(mono_runtime) --config ../../data/config $(gacutil) /i $(srcdir)/$$i /f /package 1.0 /gacdir $(GAC_DIR) /root $(GAC_ROOT_DIR) || exit 1 ; \ -+ cd $(srcdir); MONO_PATH=$(srcdir) \ -+ $(LIBTOOL) --mode=execute $(mono_runtime) --config ../../data/config $(gacutil) /i $$i /f /package 1.0 /gacdir $(GAC_DIR) /root $(GAC_ROOT_DIR) || exit 1 ; \ - done; fi - - uninstall-local: diff --git a/packages/mono/files/libtool-lossage.patch b/packages/mono/files/libtool-lossage.patch deleted file mode 100644 index ac6f0f801f..0000000000 --- a/packages/mono/files/libtool-lossage.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- mono-1.0/libgc/acinclude.m4.old 2004-07-21 19:10:53.059455128 +0100 -+++ mono-1.0/libgc/acinclude.m4 2004-07-21 19:10:56.881874032 +0100 -@@ -46,4 +46,3 @@ - ${GC_ALPHA_VERSION:+alpha=}$GC_ALPHA_VERSION) - ]) - --sinclude(libtool.m4) diff --git a/packages/mono/mono-native_1.0.bb b/packages/mono/mono-native_1.0.bb deleted file mode 100644 index c0e649faee..0000000000 --- a/packages/mono/mono-native_1.0.bb +++ /dev/null @@ -1,6 +0,0 @@ -SECTION = "unknown" -require mono_${PV}.bb -S = "${WORKDIR}/mono-${PV}" -DEPENDS = "glib-2.0-native" - -inherit native diff --git a/packages/mono/mono_1.0.bb b/packages/mono/mono_1.0.bb deleted file mode 100644 index 4aa543b3ef..0000000000 --- a/packages/mono/mono_1.0.bb +++ /dev/null @@ -1,18 +0,0 @@ -SECTION = "unknown" -DEPENDS = "mono-native glib-2.0" -LICENSE = "GPL LGPL X11" -SRC_URI = "http://mono2.ximian.com/archive/1.0/mono-1.0.tar.gz \ - file://libtool-lossage.patch;patch=1 \ - file://install-lossage.patch;patch=1" - -EXTRA_OECONF_arm = "--without-nptl" - -inherit autotools - -do_configure_prepend() { - rm -f libgc/libtool.m4 -} - -do_install() { - oe_runmake 'DESTDIR=${D}' mono_runtime='mint' install -} -- cgit v1.2.3 From d215c839252ca3a40a561a710ab000379bde0f0c Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 20 Dec 2006 14:36:14 +0000 Subject: removal.txt: mono removed --- removal.txt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/removal.txt b/removal.txt index 3877cddc2b..81359614f3 100644 --- a/removal.txt +++ b/removal.txt @@ -19,12 +19,6 @@ Maintainer: none Reason: Unfetchable, obsoleted by IT2006 release. Proposed by: Marcin 'Hrw' Juszkiewicz -Package Name: mono -Removal Date: 2006-12-15 -Maintainer: None -Reason: Obsolete version - 1.2 is current, 1.0 is not fetchable -Proposed by: Marcin 'Hrw' Juszkiewicz - Package Name: ipac-ng Removal Date: 2006-12-15 Maintainer: None -- cgit v1.2.3 From 88a26e8165cbe9cffacdaec4821e98972739a37a Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 20 Dec 2006 14:37:37 +0000 Subject: ipac-ng: dropped as scheduled. It depended on libgd-perl which is not present in metadata --- packages/ipac-ng/.mtn2git_empty | 0 packages/ipac-ng/ipac-ng-1.30/.mtn2git_empty | 0 packages/ipac-ng/ipac-ng-1.30/makefile-build-cc.diff | 11 ----------- packages/ipac-ng/ipac-ng_1.30.bb | 19 ------------------- 4 files changed, 30 deletions(-) delete mode 100644 packages/ipac-ng/.mtn2git_empty delete mode 100644 packages/ipac-ng/ipac-ng-1.30/.mtn2git_empty delete mode 100644 packages/ipac-ng/ipac-ng-1.30/makefile-build-cc.diff delete mode 100644 packages/ipac-ng/ipac-ng_1.30.bb diff --git a/packages/ipac-ng/.mtn2git_empty b/packages/ipac-ng/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/ipac-ng/ipac-ng-1.30/.mtn2git_empty b/packages/ipac-ng/ipac-ng-1.30/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/ipac-ng/ipac-ng-1.30/makefile-build-cc.diff b/packages/ipac-ng/ipac-ng-1.30/makefile-build-cc.diff deleted file mode 100644 index 1f2aa1307c..0000000000 --- a/packages/ipac-ng/ipac-ng-1.30/makefile-build-cc.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.o 2004-10-10 14:14:59.022179096 +0200 -+++ Makefile.in 2004-10-10 14:15:18.952149280 +0200 -@@ -93,7 +93,7 @@ - - - subst: subst.c -- $(CC) $(CFLAGS) -o subst subst.c -+ $(BUILD_CC) $(BUILD_CFLAGS) -o subst subst.c - - fetchipac: fetchipac.o storagetable.o billtable.o agenttable.o batch.tab.o libipac.a batch.yy.o\ - conffile.tab.o conffile.yy.o\ diff --git a/packages/ipac-ng/ipac-ng_1.30.bb b/packages/ipac-ng/ipac-ng_1.30.bb deleted file mode 100644 index 3315c44ae7..0000000000 --- a/packages/ipac-ng/ipac-ng_1.30.bb +++ /dev/null @@ -1,19 +0,0 @@ -SECTION = "console/network" -DESCRIPTION = "IPAC-NG is the iptables/ipchains based IP accounting package for Linux" -HOMEPAGE = "http://ipac-ng.sourceforge.net/" -SRC_URI = "${SOURCEFORGE_MIRROR}/ipac-ng/ipac-ng-${PV}.tar.bz2 \ - file://makefile-build-cc.diff;patch=1;pnum=0" -RDEPENDS = "perl libgd-perl" -LICENSE = "GPL" - -inherit autotools - -do_configure() { - oe_runconf -} - -do_install_append() { - install -d ${D}${sysconfdir}/ipac-ng - install -m 644 ${S}/doc/ipac.conf.sample ${D}${sysconfdir}/ipac-ng - install -m 644 ${S}/doc/rules.conf.sample ${D}${sysconfdir}/ipac-ng -} -- cgit v1.2.3 From 4eb9df8f9417be05b68b75b697300bb2321e9968 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 20 Dec 2006 14:38:05 +0000 Subject: removal.txt: ipac-ng removed --- removal.txt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/removal.txt b/removal.txt index 81359614f3..f16f7c79d3 100644 --- a/removal.txt +++ b/removal.txt @@ -19,12 +19,6 @@ Maintainer: none Reason: Unfetchable, obsoleted by IT2006 release. Proposed by: Marcin 'Hrw' Juszkiewicz -Package Name: ipac-ng -Removal Date: 2006-12-15 -Maintainer: None -Reason: Depends on libgd-perl which is not in metada -Proposed by: Marcin 'Hrw' Juszkiewicz - Package Name: task-bootstrap* Removal Date: 2006-12-22 Maintainer: None -- cgit v1.2.3 From 3bdb8ec7379bf1c34cb8e9f42aab247b9727f9a0 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 20 Dec 2006 22:16:31 +0000 Subject: libsoup: add hack to fix rebuilds * another case for packaged staging --- packages/gnome/libsoup_2.2.98.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/gnome/libsoup_2.2.98.bb b/packages/gnome/libsoup_2.2.98.bb index 581644ede5..2cddb02ac4 100644 --- a/packages/gnome/libsoup_2.2.98.bb +++ b/packages/gnome/libsoup_2.2.98.bb @@ -13,6 +13,7 @@ FILES_${PN}-dev = "${includedir}/ ${libdir}/" FILES_${PN}-doc = "${datadir}/" do_stage() { + rm -f ${STAGING_DATADIR}/pkgconfig/libsoup* autotools_stage_all ln -s ${STAGING_DATADIR}/pkgconfig/libsoup.pc ${STAGING_DATADIR}/pkgconfig/libsoup-2.2.pc } -- cgit v1.2.3 From 2431508da0e4c9982679df090d44ee477b7c9355 Mon Sep 17 00:00:00 2001 From: Andrew Wilcox Date: Mon, 18 Dec 2006 16:25:55 +0000 Subject: Remove the CRLF problem in this patch. --- packages/gcc/gcc-4.1.1/gcc-4.1.1-pr13685-1.patch | 52 ++++++++++++------------ 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/packages/gcc/gcc-4.1.1/gcc-4.1.1-pr13685-1.patch b/packages/gcc/gcc-4.1.1/gcc-4.1.1-pr13685-1.patch index a56b1307df..c1e1dec408 100644 --- a/packages/gcc/gcc-4.1.1/gcc-4.1.1-pr13685-1.patch +++ b/packages/gcc/gcc-4.1.1/gcc-4.1.1-pr13685-1.patch @@ -1,26 +1,26 @@ -Submitted By: Alexander E. Patrakov -Date: 2006-12-11 -Initial Package Version: 4.1.1 -Upstream Status: backport -Origin: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=28621 -Description: Fix crash of programs compiled with -Os -ffast-math -(affects procps on the LiveCD) ---- gcc-4.1.1/gcc/config/i386/i386.c -+++ gcc-4.1.1/gcc/config/i386/i386.c -@@ -1502,12 +1502,10 @@ - } - - /* Validate -mpreferred-stack-boundary= value, or provide default. -- The default of 128 bits is for Pentium III's SSE __m128, but we -- don't want additional code to keep the stack aligned when -- optimizing for code size. */ -- ix86_preferred_stack_boundary = (optimize_size -- ? TARGET_64BIT ? 128 : 32 -- : 128); -+ The default of 128 bits is for Pentium III's SSE __m128, We can't -+ change it because of optimize_size. Otherwise, we can't mix object -+ files compiled with -Os and -On. */ -+ ix86_preferred_stack_boundary = 128; - if (ix86_preferred_stack_boundary_string) - { - i = atoi (ix86_preferred_stack_boundary_string); +Submitted By: Alexander E. Patrakov +Date: 2006-12-11 +Initial Package Version: 4.1.1 +Upstream Status: backport +Origin: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=28621 +Description: Fix crash of programs compiled with -Os -ffast-math +(affects procps on the LiveCD) +--- gcc-4.1.1/gcc/config/i386/i386.c ++++ gcc-4.1.1/gcc/config/i386/i386.c +@@ -1502,12 +1502,10 @@ + } + + /* Validate -mpreferred-stack-boundary= value, or provide default. +- The default of 128 bits is for Pentium III's SSE __m128, but we +- don't want additional code to keep the stack aligned when +- optimizing for code size. */ +- ix86_preferred_stack_boundary = (optimize_size +- ? TARGET_64BIT ? 128 : 32 +- : 128); ++ The default of 128 bits is for Pentium III's SSE __m128, We can't ++ change it because of optimize_size. Otherwise, we can't mix object ++ files compiled with -Os and -On. */ ++ ix86_preferred_stack_boundary = 128; + if (ix86_preferred_stack_boundary_string) + { + i = atoi (ix86_preferred_stack_boundary_string); -- cgit v1.2.3 From 775c7cbf3b1f0f18f556ce0bf7bbe8eecf48c94f Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Wed, 20 Dec 2006 16:05:25 +0000 Subject: gdb: basic unification of recipes --- packages/gdb/gdb-cross_6.1.bb | 6 ++---- packages/gdb/gdb-cross_6.2.1.bb | 5 ++--- packages/gdb/gdb-cross_6.2.bb | 6 ++---- packages/gdb/gdb-cross_6.3.bb | 5 ++--- packages/gdb/gdb-cross_6.4.bb | 6 ++---- packages/gdb/gdb.inc | 5 +++++ packages/gdb/gdb_6.1.bb | 6 ++---- packages/gdb/gdb_6.2.1.bb | 7 ++----- packages/gdb/gdb_6.2.bb | 6 ++---- packages/gdb/gdb_6.3.bb | 7 ++----- packages/gdb/gdb_6.4.bb | 7 ++----- 11 files changed, 25 insertions(+), 41 deletions(-) create mode 100644 packages/gdb/gdb.inc diff --git a/packages/gdb/gdb-cross_6.1.bb b/packages/gdb/gdb-cross_6.1.bb index 8ab16527ac..f3e480042a 100644 --- a/packages/gdb/gdb-cross_6.1.bb +++ b/packages/gdb/gdb-cross_6.1.bb @@ -1,7 +1,5 @@ -LICENSE = "GPL" -DESCRIPTION = "gdb - GNU debugger" -SECTION = "devel" -PRIORITY = "optional" +require gdb.inc + DEPENDS = "ncurses-native" inherit autotools sdk diff --git a/packages/gdb/gdb-cross_6.2.1.bb b/packages/gdb/gdb-cross_6.2.1.bb index 32076b529e..0aba890eef 100644 --- a/packages/gdb/gdb-cross_6.2.1.bb +++ b/packages/gdb/gdb-cross_6.2.1.bb @@ -1,7 +1,6 @@ -LICENSE = "GPL" -DESCRIPTION = "gdb - GNU debugger" +require gdb.inc + SECTION = "base" -PRIORITY = "optional" DEPENDS = "ncurses-native" inherit autotools sdk diff --git a/packages/gdb/gdb-cross_6.2.bb b/packages/gdb/gdb-cross_6.2.bb index 8ab16527ac..f3e480042a 100644 --- a/packages/gdb/gdb-cross_6.2.bb +++ b/packages/gdb/gdb-cross_6.2.bb @@ -1,7 +1,5 @@ -LICENSE = "GPL" -DESCRIPTION = "gdb - GNU debugger" -SECTION = "devel" -PRIORITY = "optional" +require gdb.inc + DEPENDS = "ncurses-native" inherit autotools sdk diff --git a/packages/gdb/gdb-cross_6.3.bb b/packages/gdb/gdb-cross_6.3.bb index 45cb196d9d..9cc72cca69 100644 --- a/packages/gdb/gdb-cross_6.3.bb +++ b/packages/gdb/gdb-cross_6.3.bb @@ -1,7 +1,6 @@ -LICENSE = "GPL" -DESCRIPTION = "gdb - GNU debugger" +require gdb.inc + SECTION = "base" -PRIORITY = "optional" DEPENDS = "ncurses-native" inherit autotools sdk diff --git a/packages/gdb/gdb-cross_6.4.bb b/packages/gdb/gdb-cross_6.4.bb index 7c9180ad6a..3a108d568b 100644 --- a/packages/gdb/gdb-cross_6.4.bb +++ b/packages/gdb/gdb-cross_6.4.bb @@ -1,8 +1,6 @@ -LICENSE = "GPL" -DESCRIPTION = "gdb - GNU debugger" +require gdb.inc + SECTION = "base" -PRIORITY = "optional" -LICENSE = "GPL" DEPENDS = "ncurses-native" SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz" diff --git a/packages/gdb/gdb.inc b/packages/gdb/gdb.inc new file mode 100644 index 0000000000..168e85f5ba --- /dev/null +++ b/packages/gdb/gdb.inc @@ -0,0 +1,5 @@ +DESCRIPTION = "gdb - GNU debugger" +HOMEPAGE = "http://www.gnu.org/software/gdb/" +LICENSE="GPL" +SECTION = "devel" +PRIORITY = "optional" diff --git a/packages/gdb/gdb_6.1.bb b/packages/gdb/gdb_6.1.bb index 797148f262..6191061d16 100644 --- a/packages/gdb/gdb_6.1.bb +++ b/packages/gdb/gdb_6.1.bb @@ -1,7 +1,5 @@ -LICENSE = "GPL" -DESCRIPTION = "gdb - GNU debugger" -SECTION = "devel" -PRIORITY = "optional" +require gdb.inc + DEPENDS = "ncurses readline" PACKAGES =+ 'gdbserver ' diff --git a/packages/gdb/gdb_6.2.1.bb b/packages/gdb/gdb_6.2.1.bb index d8aa548d8f..641cd927b1 100644 --- a/packages/gdb/gdb_6.2.1.bb +++ b/packages/gdb/gdb_6.2.1.bb @@ -1,8 +1,5 @@ -DESCRIPTION = "gdb - GNU debugger" -HOMEPAGE = "http://www.gnu.org/software/gdb/" -LICENSE="GPL" -SECTION = "devel" -PRIORITY = "optional" +require gdb.inc + DEPENDS = "ncurses readline" PACKAGES =+ 'gdbserver ' diff --git a/packages/gdb/gdb_6.2.bb b/packages/gdb/gdb_6.2.bb index 809c90173f..75a08972a5 100644 --- a/packages/gdb/gdb_6.2.bb +++ b/packages/gdb/gdb_6.2.bb @@ -1,7 +1,5 @@ -DESCRIPTION = "gdb - GNU debugger" -LICENSE="GPL" -SECTION = "devel" -PRIORITY = "optional" +require gdb.inc + PR = "r1" DEPENDS = "ncurses readline" diff --git a/packages/gdb/gdb_6.3.bb b/packages/gdb/gdb_6.3.bb index bce00f42f1..a1c9f9ede4 100644 --- a/packages/gdb/gdb_6.3.bb +++ b/packages/gdb/gdb_6.3.bb @@ -1,8 +1,5 @@ -DESCRIPTION = "gdb - GNU debugger" -HOMEPAGE = "http://www.gnu.org/software/gdb/" -LICENSE="GPL" -SECTION = "devel" -PRIORITY = "optional" +require gdb.inc + DEPENDS = "ncurses readline" RDEPENDS_openmn = "libthread-db1" PR = "r2" diff --git a/packages/gdb/gdb_6.4.bb b/packages/gdb/gdb_6.4.bb index b32891d2c5..0452fda1a1 100644 --- a/packages/gdb/gdb_6.4.bb +++ b/packages/gdb/gdb_6.4.bb @@ -1,8 +1,5 @@ -DESCRIPTION = "gdb - GNU debugger" -HOMEPAGE = "http://www.gnu.org/software/gdb/" -LICENSE="GPL" -SECTION = "devel" -PRIORITY = "optional" +require gdb.inc + DEPENDS = "ncurses readline" RDEPENDS_openmn = "libthread-db1" -- cgit v1.2.3 From 161e8719295762b01469f0a7dcb3ba9c701d4715 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Wed, 20 Dec 2006 16:12:55 +0000 Subject: gpe-mini-browser: basic unification of recipes --- packages/gpe-mini-browser/gpe-mini-browser-hildon_0.15.bb | 4 ++-- packages/gpe-mini-browser/gpe-mini-browser-hildon_0.16.bb | 3 ++- packages/gpe-mini-browser/gpe-mini-browser-hildon_0.17.bb | 3 ++- packages/gpe-mini-browser/gpe-mini-browser.inc | 2 ++ packages/gpe-mini-browser/gpe-mini-browser_0.11.bb | 2 ++ packages/gpe-mini-browser/gpe-mini-browser_0.14.bb | 4 ++-- packages/gpe-mini-browser/gpe-mini-browser_0.15.bb | 4 ++-- packages/gpe-mini-browser/gpe-mini-browser_0.16.bb | 4 ++-- packages/gpe-mini-browser/gpe-mini-browser_0.17.bb | 4 ++-- packages/gpe-mini-browser/gpe-mini-browser_0.18.bb | 4 ++-- packages/gpe-mini-browser/gpe-mini-browser_0.19.bb | 7 +++---- packages/gpe-mini-browser/gpe-mini-browser_svn.bb | 5 ++--- 12 files changed, 25 insertions(+), 21 deletions(-) create mode 100644 packages/gpe-mini-browser/gpe-mini-browser.inc diff --git a/packages/gpe-mini-browser/gpe-mini-browser-hildon_0.15.bb b/packages/gpe-mini-browser/gpe-mini-browser-hildon_0.15.bb index 14f5313bcc..6f1ba31274 100644 --- a/packages/gpe-mini-browser/gpe-mini-browser-hildon_0.15.bb +++ b/packages/gpe-mini-browser/gpe-mini-browser-hildon_0.15.bb @@ -1,8 +1,8 @@ +require gpe-mini-browser.inc + PR = "r0" SRC_URI = "${GPE_MIRROR}/gpe-mini-browser-${PV}.tar.gz" -DESCRIPTION = "A lightweight webbrowser for the GPE platform (Hildon UI)" -LICENSE = "GPL" DEPENDS = "osb-nrcit libosso hildon-lgpl hildon-fm libgpewidget" EXTRA_OECONF = "--enable-hildon" diff --git a/packages/gpe-mini-browser/gpe-mini-browser-hildon_0.16.bb b/packages/gpe-mini-browser/gpe-mini-browser-hildon_0.16.bb index 14f5313bcc..5f3d1f4d1b 100644 --- a/packages/gpe-mini-browser/gpe-mini-browser-hildon_0.16.bb +++ b/packages/gpe-mini-browser/gpe-mini-browser-hildon_0.16.bb @@ -1,8 +1,9 @@ +require gpe-mini-browser.inc + PR = "r0" SRC_URI = "${GPE_MIRROR}/gpe-mini-browser-${PV}.tar.gz" DESCRIPTION = "A lightweight webbrowser for the GPE platform (Hildon UI)" -LICENSE = "GPL" DEPENDS = "osb-nrcit libosso hildon-lgpl hildon-fm libgpewidget" EXTRA_OECONF = "--enable-hildon" diff --git a/packages/gpe-mini-browser/gpe-mini-browser-hildon_0.17.bb b/packages/gpe-mini-browser/gpe-mini-browser-hildon_0.17.bb index 23d8939e9d..3069730fbb 100644 --- a/packages/gpe-mini-browser/gpe-mini-browser-hildon_0.17.bb +++ b/packages/gpe-mini-browser/gpe-mini-browser-hildon_0.17.bb @@ -1,8 +1,9 @@ +require gpe-mini-browser.inc + PR = "r0" SRC_URI = "${GPE_MIRROR}/gpe-mini-browser-${PV}.tar.gz" DESCRIPTION = "A lightweight webbrowser for the GPE platform (Hildon UI)" -LICENSE = "GPL" DEPENDS = "osb-nrcit libosso hildon-lgpl hildon-fm libgpewidget" EXTRA_OECONF = "--enable-hildon" diff --git a/packages/gpe-mini-browser/gpe-mini-browser.inc b/packages/gpe-mini-browser/gpe-mini-browser.inc new file mode 100644 index 0000000000..733654bebc --- /dev/null +++ b/packages/gpe-mini-browser/gpe-mini-browser.inc @@ -0,0 +1,2 @@ +DESCRIPTION = "A lightweight webbrowser for the GPE platform" +LICENSE = "GPL" diff --git a/packages/gpe-mini-browser/gpe-mini-browser_0.11.bb b/packages/gpe-mini-browser/gpe-mini-browser_0.11.bb index 5430139677..faa6bca828 100644 --- a/packages/gpe-mini-browser/gpe-mini-browser_0.11.bb +++ b/packages/gpe-mini-browser/gpe-mini-browser_0.11.bb @@ -1,3 +1,5 @@ +require gpe-mini-browser.inc + PR = "r0" SRC_URI = "http://stag.mind.be/gpe-mini-browser-${PV}.tar.bz2" diff --git a/packages/gpe-mini-browser/gpe-mini-browser_0.14.bb b/packages/gpe-mini-browser/gpe-mini-browser_0.14.bb index 82308e82a6..68d0fbfb98 100644 --- a/packages/gpe-mini-browser/gpe-mini-browser_0.14.bb +++ b/packages/gpe-mini-browser/gpe-mini-browser_0.14.bb @@ -1,8 +1,8 @@ +require gpe-mini-browser.inc + PR = "r0" SRC_URI = "http://handhelds.org/~philippe/gpe-mini-browser-${PV}.tar.bz2" -DESCRIPTION = "A lightweight webbrowser for the GPE platform" -LICENSE = "GPL" DEPENDS = "osb-nrcit" S = "${WORKDIR}/gpe-mini-browser" diff --git a/packages/gpe-mini-browser/gpe-mini-browser_0.15.bb b/packages/gpe-mini-browser/gpe-mini-browser_0.15.bb index 2745e5f8a9..06e910af53 100644 --- a/packages/gpe-mini-browser/gpe-mini-browser_0.15.bb +++ b/packages/gpe-mini-browser/gpe-mini-browser_0.15.bb @@ -1,8 +1,8 @@ +require gpe-mini-browser.inc + PR = "r1" SRC_URI = "ftp://ftp.handhelds.org/projects/gpe/source/gpe-mini-browser-${PV}.tar.gz" -DESCRIPTION = "A lightweight webbrowser for the GPE platform" -LICENSE = "GPL" DEPENDS = "osb-nrcit libgpewidget" S = "${WORKDIR}/gpe-mini-browser-${PV}" diff --git a/packages/gpe-mini-browser/gpe-mini-browser_0.16.bb b/packages/gpe-mini-browser/gpe-mini-browser_0.16.bb index ee41ff26c2..35cca41d18 100644 --- a/packages/gpe-mini-browser/gpe-mini-browser_0.16.bb +++ b/packages/gpe-mini-browser/gpe-mini-browser_0.16.bb @@ -1,8 +1,8 @@ +require gpe-mini-browser.inc + PR = "r1" SRC_URI = "ftp://ftp.handhelds.org/projects/gpe/source/gpe-mini-browser-${PV}.tar.gz" -DESCRIPTION = "A lightweight webbrowser for the GPE platform" -LICENSE = "GPL" DEPENDS = "osb-nrcit sqlite libgpewidget" S = "${WORKDIR}/gpe-mini-browser-${PV}" diff --git a/packages/gpe-mini-browser/gpe-mini-browser_0.17.bb b/packages/gpe-mini-browser/gpe-mini-browser_0.17.bb index 4a09fb827d..99523c08f8 100644 --- a/packages/gpe-mini-browser/gpe-mini-browser_0.17.bb +++ b/packages/gpe-mini-browser/gpe-mini-browser_0.17.bb @@ -1,6 +1,6 @@ +require gpe-mini-browser.inc + SRC_URI = "ftp://ftp.handhelds.org/projects/gpe/source/gpe-mini-browser-${PV}.tar.gz" -DESCRIPTION = "A lightweight webbrowser for the GPE platform" -LICENSE = "GPL" DEPENDS = "osb-nrcit sqlite libgpewidget" RRECOMMENDS = "gdk-pixbuf-loader-gif gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg" diff --git a/packages/gpe-mini-browser/gpe-mini-browser_0.18.bb b/packages/gpe-mini-browser/gpe-mini-browser_0.18.bb index 4a09fb827d..99523c08f8 100644 --- a/packages/gpe-mini-browser/gpe-mini-browser_0.18.bb +++ b/packages/gpe-mini-browser/gpe-mini-browser_0.18.bb @@ -1,6 +1,6 @@ +require gpe-mini-browser.inc + SRC_URI = "ftp://ftp.handhelds.org/projects/gpe/source/gpe-mini-browser-${PV}.tar.gz" -DESCRIPTION = "A lightweight webbrowser for the GPE platform" -LICENSE = "GPL" DEPENDS = "osb-nrcit sqlite libgpewidget" RRECOMMENDS = "gdk-pixbuf-loader-gif gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg" diff --git a/packages/gpe-mini-browser/gpe-mini-browser_0.19.bb b/packages/gpe-mini-browser/gpe-mini-browser_0.19.bb index 566b9820ba..225a12d4ae 100644 --- a/packages/gpe-mini-browser/gpe-mini-browser_0.19.bb +++ b/packages/gpe-mini-browser/gpe-mini-browser_0.19.bb @@ -1,9 +1,8 @@ +require gpe-mini-browser.inc + SRC_URI = "http://gpe.linuxtogo.org/download/source/gpe-mini-browser-${PV}.tar.gz" -DESCRIPTION = "A lightweight webbrowser for the GPE platform" -LICENSE = "GPL" DEPENDS = "osb-nrcit sqlite libgpewidget" -RRECOMMENDS = "gdk-pixbuf-loader-gif gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg" - +RRECOMMENDS = "gdk-pixbuf-loader-gif gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg" S = "${WORKDIR}/gpe-mini-browser-${PV}" diff --git a/packages/gpe-mini-browser/gpe-mini-browser_svn.bb b/packages/gpe-mini-browser/gpe-mini-browser_svn.bb index 62b93667b8..dc5c022580 100644 --- a/packages/gpe-mini-browser/gpe-mini-browser_svn.bb +++ b/packages/gpe-mini-browser/gpe-mini-browser_svn.bb @@ -1,7 +1,6 @@ -DEFAULT_PREFERENCE = "-1" +require gpe-mini-browser.inc -DESCRIPTION = "A lightweight webbrowser for the GPE platform" -LICENSE = "GPL" +DEFAULT_PREFERENCE = "-1" DEPENDS = "sqlite gettext gtk+ glib-2.0 osb-nrcit libgpewidget" RRECOMMENDS = "gdk-pixbuf-loader-gif gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg" -- cgit v1.2.3 From d90659109db07aa5bff69da5c3f35ca4e553710d Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Wed, 20 Dec 2006 16:14:20 +0000 Subject: matchbox-wm: basic unification of recipes --- packages/matchbox-wm/matchbox-wm.inc | 3 +++ packages/matchbox-wm/matchbox-wm_0.8.3.bb | 5 ++--- packages/matchbox-wm/matchbox-wm_0.8.4.bb | 5 ++--- packages/matchbox-wm/matchbox-wm_0.9.2.bb | 5 ++--- packages/matchbox-wm/matchbox-wm_0.9.3.bb | 5 ++--- packages/matchbox-wm/matchbox-wm_0.9.4.bb | 6 ++---- packages/matchbox-wm/matchbox-wm_0.9.5.bb | 6 ++---- packages/matchbox-wm/matchbox-wm_0.9.bb | 5 ++--- packages/matchbox-wm/matchbox-wm_1.0.bb | 5 ++--- packages/matchbox-wm/matchbox-wm_1.1.bb | 6 ++---- packages/matchbox-wm/matchbox-wm_svn.bb | 5 ++--- 11 files changed, 23 insertions(+), 33 deletions(-) create mode 100644 packages/matchbox-wm/matchbox-wm.inc diff --git a/packages/matchbox-wm/matchbox-wm.inc b/packages/matchbox-wm/matchbox-wm.inc new file mode 100644 index 0000000000..55ed9f7131 --- /dev/null +++ b/packages/matchbox-wm/matchbox-wm.inc @@ -0,0 +1,3 @@ +DESCRIPTION = "Matchbox window manager" +SECTION = "x11/wm" +LICENSE = "GPL" diff --git a/packages/matchbox-wm/matchbox-wm_0.8.3.bb b/packages/matchbox-wm/matchbox-wm_0.8.3.bb index 947f14e867..a6a77c5441 100644 --- a/packages/matchbox-wm/matchbox-wm_0.8.3.bb +++ b/packages/matchbox-wm/matchbox-wm_0.8.3.bb @@ -1,6 +1,5 @@ -SECTION = "x11/wm" -DESCRIPTION = "Matchbox window manager" -LICENSE = "GPL" +require matchbox-wm.inc + DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" RDEPENDS = "matchbox-common" diff --git a/packages/matchbox-wm/matchbox-wm_0.8.4.bb b/packages/matchbox-wm/matchbox-wm_0.8.4.bb index 947f14e867..a6a77c5441 100644 --- a/packages/matchbox-wm/matchbox-wm_0.8.4.bb +++ b/packages/matchbox-wm/matchbox-wm_0.8.4.bb @@ -1,6 +1,5 @@ -SECTION = "x11/wm" -DESCRIPTION = "Matchbox window manager" -LICENSE = "GPL" +require matchbox-wm.inc + DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" RDEPENDS = "matchbox-common" diff --git a/packages/matchbox-wm/matchbox-wm_0.9.2.bb b/packages/matchbox-wm/matchbox-wm_0.9.2.bb index 304efc3c44..9123b0ffca 100644 --- a/packages/matchbox-wm/matchbox-wm_0.9.2.bb +++ b/packages/matchbox-wm/matchbox-wm_0.9.2.bb @@ -1,6 +1,5 @@ -SECTION = "x11/wm" -DESCRIPTION = "Matchbox window manager" -LICENSE = "GPL" +require matchbox-wm.inc + DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" RDEPENDS = "matchbox-common" PR = "r1" diff --git a/packages/matchbox-wm/matchbox-wm_0.9.3.bb b/packages/matchbox-wm/matchbox-wm_0.9.3.bb index 3a46009a4c..390ecf53ad 100644 --- a/packages/matchbox-wm/matchbox-wm_0.9.3.bb +++ b/packages/matchbox-wm/matchbox-wm_0.9.3.bb @@ -1,6 +1,5 @@ -SECTION = "x11/wm" -DESCRIPTION = "Matchbox window manager" -LICENSE = "GPL" +require matchbox-wm.inc + DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" RDEPENDS = "matchbox-common" PR = "r2" diff --git a/packages/matchbox-wm/matchbox-wm_0.9.4.bb b/packages/matchbox-wm/matchbox-wm_0.9.4.bb index 4fa9a6bd74..5ce26cbab2 100644 --- a/packages/matchbox-wm/matchbox-wm_0.9.4.bb +++ b/packages/matchbox-wm/matchbox-wm_0.9.4.bb @@ -1,10 +1,8 @@ -SECTION = "x11/wm" -DESCRIPTION = "Matchbox window manager" -LICENSE = "GPL" +require matchbox-wm.inc + DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" RDEPENDS = "matchbox-common" - SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/0.9/matchbox-window-manager-${PV}.tar.gz \ file://kbdconfig" diff --git a/packages/matchbox-wm/matchbox-wm_0.9.5.bb b/packages/matchbox-wm/matchbox-wm_0.9.5.bb index 8c87711950..f135ffd426 100644 --- a/packages/matchbox-wm/matchbox-wm_0.9.5.bb +++ b/packages/matchbox-wm/matchbox-wm_0.9.5.bb @@ -1,11 +1,9 @@ -SECTION = "x11/wm" -DESCRIPTION = "Matchbox window manager" -LICENSE = "GPL" +require matchbox-wm.inc + DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" RDEPENDS = "matchbox-common" PR="r1" - SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/0.9/matchbox-window-manager-${PV}.tar.gz \ file://kbdconfig" diff --git a/packages/matchbox-wm/matchbox-wm_0.9.bb b/packages/matchbox-wm/matchbox-wm_0.9.bb index 4a9fa639f2..8387d957a1 100644 --- a/packages/matchbox-wm/matchbox-wm_0.9.bb +++ b/packages/matchbox-wm/matchbox-wm_0.9.bb @@ -1,6 +1,5 @@ -SECTION = "x11/wm" -DESCRIPTION = "Matchbox window manager" -LICENSE = "GPL" +require matchbox-wm.inc + DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" RDEPENDS = "matchbox-common" diff --git a/packages/matchbox-wm/matchbox-wm_1.0.bb b/packages/matchbox-wm/matchbox-wm_1.0.bb index a933668692..e55f7a5c4e 100644 --- a/packages/matchbox-wm/matchbox-wm_1.0.bb +++ b/packages/matchbox-wm/matchbox-wm_1.0.bb @@ -1,6 +1,5 @@ -SECTION = "x11/wm" -DESCRIPTION = "Matchbox window manager" -LICENSE = "GPL" +require matchbox-wm.inc + DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" RDEPENDS = "matchbox-common" diff --git a/packages/matchbox-wm/matchbox-wm_1.1.bb b/packages/matchbox-wm/matchbox-wm_1.1.bb index 275a556d3c..c3e8186481 100644 --- a/packages/matchbox-wm/matchbox-wm_1.1.bb +++ b/packages/matchbox-wm/matchbox-wm_1.1.bb @@ -1,12 +1,10 @@ -SECTION = "x11/wm" -DESCRIPTION = "Matchbox window manager" -LICENSE = "GPL" +require matchbox-wm.inc + DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" RDEPENDS = "matchbox-common" PR="r1" - SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/1.1/matchbox-window-manager-${PV}.tar.gz \ file://kbdconfig" diff --git a/packages/matchbox-wm/matchbox-wm_svn.bb b/packages/matchbox-wm/matchbox-wm_svn.bb index 381be22652..91c66dae90 100644 --- a/packages/matchbox-wm/matchbox-wm_svn.bb +++ b/packages/matchbox-wm/matchbox-wm_svn.bb @@ -1,6 +1,5 @@ -SECTION = "x11/wm" -DESCRIPTION = "Matchbox window manager" -LICENSE = "GPL" +require matchbox-wm.inc + DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" RDEPENDS = "matchbox-common" PV = "1.1+svn${SRCDATE}" -- cgit v1.2.3 From 38b93f84292c8c73dbe31a819af460a25c6366c5 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Wed, 20 Dec 2006 16:15:48 +0000 Subject: pvrusb2-mci: basic unification of recipes --- packages/pvrusb2-mci/pvrusb2-mci.inc | 6 ++++++ packages/pvrusb2-mci/pvrusb2-mci_20050911.bb | 7 ++----- packages/pvrusb2-mci/pvrusb2-mci_20050921.bb | 7 ++----- packages/pvrusb2-mci/pvrusb2-mci_20051016.bb | 6 ++---- packages/pvrusb2-mci/pvrusb2-mci_20051113.bb | 6 ++---- packages/pvrusb2-mci/pvrusb2-mci_20060101.bb | 6 ++---- packages/pvrusb2-mci/pvrusb2-mci_20060103.bb | 6 ++---- packages/pvrusb2-mci/pvrusb2-mci_20060121.bb | 6 ++---- packages/pvrusb2-mci/pvrusb2-mci_20060209.bb | 6 ++---- packages/pvrusb2-mci/pvrusb2-mci_20060326.bb | 6 ++---- packages/pvrusb2-mci/pvrusb2-mci_20060329.bb | 6 ++---- packages/pvrusb2-mci/pvrusb2-mci_20060423.bb | 7 ++----- packages/pvrusb2-mci/pvrusb2-mci_20060517.bb | 7 ++----- packages/pvrusb2-mci/pvrusb2-mci_20060607.bb | 7 ++----- packages/pvrusb2-mci/pvrusb2-mci_20060626.bb | 7 ++----- packages/pvrusb2-mci/pvrusb2-mci_20060702.bb | 7 ++----- packages/pvrusb2-mci/pvrusb2-mci_20060726.bb | 7 ++----- packages/pvrusb2-mci/pvrusb2-mci_20060903.bb | 9 ++------- 18 files changed, 40 insertions(+), 79 deletions(-) create mode 100644 packages/pvrusb2-mci/pvrusb2-mci.inc diff --git a/packages/pvrusb2-mci/pvrusb2-mci.inc b/packages/pvrusb2-mci/pvrusb2-mci.inc new file mode 100644 index 0000000000..2e1fdac02d --- /dev/null +++ b/packages/pvrusb2-mci/pvrusb2-mci.inc @@ -0,0 +1,6 @@ +DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2" +AUTHOR = "Mike Isely" +HOMEPAGE = "http://www.isely.net/pvrusb2.html" +SECTION = "kernel/modules" +PRIORITY = "optional" +LICENSE = "GPL" diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20050911.bb b/packages/pvrusb2-mci/pvrusb2-mci_20050911.bb index c556e638c2..af89c52d3b 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20050911.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20050911.bb @@ -1,8 +1,5 @@ -DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2" -PRIORITY = "optional" -SECTION = "kernel/modules" -LICENSE = "GPL" -PR = "r0" +require pvrusb2-mci.inc + # It in fact requires these modules, but for now is using the local ones. # RDEPENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115" diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20050921.bb b/packages/pvrusb2-mci/pvrusb2-mci_20050921.bb index 009bf45be2..5939b10005 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20050921.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20050921.bb @@ -1,8 +1,5 @@ -DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2" -PRIORITY = "optional" -SECTION = "kernel/modules" -LICENSE = "GPL" -PR = "r0" +require pvrusb2-mci.inc + RDEPENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400" # It in fact also requires kernel-module-saa7115", but for now is using the local ones. diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20051016.bb b/packages/pvrusb2-mci/pvrusb2-mci_20051016.bb index 9ea0c51450..4cc77a9634 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20051016.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20051016.bb @@ -1,7 +1,5 @@ -DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2" -PRIORITY = "optional" -SECTION = "kernel/modules" -LICENSE = "GPL" +require pvrusb2-mci.inc + PR = "r1" # It in fact requires these modules, but for now is using the local ones. # RDEPENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115" diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20051113.bb b/packages/pvrusb2-mci/pvrusb2-mci_20051113.bb index 33d015aafc..4fc41c15d1 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20051113.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20051113.bb @@ -1,7 +1,5 @@ -DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2" -PRIORITY = "optional" -SECTION = "kernel/modules" -LICENSE = "GPL" +require pvrusb2-mci.inc + PR = "r1" # It in fact requires these modules, but for now is using the local ones. # RDEPENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115" diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060101.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060101.bb index 3712f3239b..a3808d38d8 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060101.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20060101.bb @@ -1,7 +1,5 @@ -DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2" -PRIORITY = "optional" -SECTION = "kernel/modules" -LICENSE = "GPL" +require pvrusb2-mci.inc + PR = "r1" # It in fact requires these modules, but for now is using the local ones. # RRECOMMEND = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115" diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060103.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060103.bb index d547c979d4..cc0bedd545 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060103.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20060103.bb @@ -1,7 +1,5 @@ -DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2" -PRIORITY = "optional" -SECTION = "kernel/modules" -LICENSE = "GPL" +require pvrusb2-mci.inc + PR = "r1" # It in fact requires these modules, but for now is using the local ones. # RRECOMMEND = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115" diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060121.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060121.bb index e5a19514a9..9a32e497f4 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060121.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20060121.bb @@ -1,7 +1,5 @@ -DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2" -PRIORITY = "optional" -SECTION = "kernel/modules" -LICENSE = "GPL" +require pvrusb2-mci.inc + PR = "r1" # It in fact requires these modules, but for now is using the local ones. # RRECOMMEND = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115" diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060209.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060209.bb index c95f942189..1f32dc3f4b 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060209.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20060209.bb @@ -1,7 +1,5 @@ -DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2" -PRIORITY = "optional" -SECTION = "kernel/modules" -LICENSE = "GPL" +require pvrusb2-mci.inc + PR = "r2" RRECOMMENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115 kernel-module-tda9887" diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060326.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060326.bb index 583c7825fe..190002cb7b 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060326.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20060326.bb @@ -1,7 +1,5 @@ -DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2" -PRIORITY = "optional" -SECTION = "kernel/modules" -LICENSE = "GPL" +require pvrusb2-mci.inc + PR = "r1" RRECOMMENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115 kernel-module-tda9887" diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060329.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060329.bb index 4c4ab65d99..de86b31f1b 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060329.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20060329.bb @@ -1,7 +1,5 @@ -DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2" -PRIORITY = "optional" -SECTION = "kernel/modules" -LICENSE = "GPL" +require pvrusb2-mci.inc + PR = "r1" RRECOMMENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115 kernel-module-tda9887" diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060423.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060423.bb index 640297662f..de86b31f1b 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060423.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20060423.bb @@ -1,8 +1,5 @@ -DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2" -HOMEPAGE = "http://www.isely.net/pvrusb2.html" -PRIORITY = "optional" -SECTION = "kernel/modules" -LICENSE = "GPL" +require pvrusb2-mci.inc + PR = "r1" RRECOMMENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115 kernel-module-tda9887" diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060517.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060517.bb index 640297662f..de86b31f1b 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060517.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20060517.bb @@ -1,8 +1,5 @@ -DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2" -HOMEPAGE = "http://www.isely.net/pvrusb2.html" -PRIORITY = "optional" -SECTION = "kernel/modules" -LICENSE = "GPL" +require pvrusb2-mci.inc + PR = "r1" RRECOMMENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115 kernel-module-tda9887" diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060607.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060607.bb index 640297662f..de86b31f1b 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060607.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20060607.bb @@ -1,8 +1,5 @@ -DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2" -HOMEPAGE = "http://www.isely.net/pvrusb2.html" -PRIORITY = "optional" -SECTION = "kernel/modules" -LICENSE = "GPL" +require pvrusb2-mci.inc + PR = "r1" RRECOMMENDS = "kernel-module-tveeprom kernel-module-tuner kernel-module-msp3400 kernel-module-saa7115 kernel-module-tda9887" diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060626.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060626.bb index 0ff030a8e4..dae4ee5bb3 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060626.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20060626.bb @@ -1,8 +1,5 @@ -DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2" -HOMEPAGE = "http://www.isely.net/pvrusb2.html" -PRIORITY = "optional" -SECTION = "kernel/modules" -LICENSE = "GPL" +require pvrusb2-mci.inc + PR = "r1" RRECOMMENDS = "kernel-module-tveeprom \ kernel-module-firmware-class \ diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060702.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060702.bb index 0ff030a8e4..dae4ee5bb3 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060702.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20060702.bb @@ -1,8 +1,5 @@ -DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2" -HOMEPAGE = "http://www.isely.net/pvrusb2.html" -PRIORITY = "optional" -SECTION = "kernel/modules" -LICENSE = "GPL" +require pvrusb2-mci.inc + PR = "r1" RRECOMMENDS = "kernel-module-tveeprom \ kernel-module-firmware-class \ diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060726.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060726.bb index 0ff030a8e4..dae4ee5bb3 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060726.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20060726.bb @@ -1,8 +1,5 @@ -DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2" -HOMEPAGE = "http://www.isely.net/pvrusb2.html" -PRIORITY = "optional" -SECTION = "kernel/modules" -LICENSE = "GPL" +require pvrusb2-mci.inc + PR = "r1" RRECOMMENDS = "kernel-module-tveeprom \ kernel-module-firmware-class \ diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060903.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060903.bb index c6e8c6d1c5..298c529924 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060903.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20060903.bb @@ -1,9 +1,5 @@ -DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2" -AUTHOR = "Mike Isely" -HOMEPAGE = "http://www.isely.net/pvrusb2.html" -SECTION = "kernel/modules" -PRIORITY = "optional" -LICENSE = "GPL" +require pvrusb2-mci.inc + RRECOMMENDS = "kernel-module-tveeprom \ kernel-module-firmware-class \ kernel-module-tuner \ @@ -13,7 +9,6 @@ RRECOMMENDS = "kernel-module-tveeprom \ kernel-module-v4l1-compat \ kernel-module-v4l2-common \ kernel-module-videodev" -PR = "r0" SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-${PV}.tar.bz2 \ file://hotplug.functions \ -- cgit v1.2.3 From 6ffb61ede8614309451248be91b60cf733b947e2 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Wed, 20 Dec 2006 23:23:48 +0000 Subject: centericq: unify --- packages/centericq/centericq.inc | 14 ++++++++++++++ packages/centericq/centericq_4.11.0.bb | 12 +----------- packages/centericq/centericq_4.9.10.bb | 11 +---------- packages/centericq/centericq_4.9.7.bb | 14 +------------- 4 files changed, 17 insertions(+), 34 deletions(-) create mode 100644 packages/centericq/centericq.inc diff --git a/packages/centericq/centericq.inc b/packages/centericq/centericq.inc new file mode 100644 index 0000000000..2773ac61fd --- /dev/null +++ b/packages/centericq/centericq.inc @@ -0,0 +1,14 @@ +DESCRIPTION = "An ncurses-based IM client for ICQ2000, Yahoo!, \ +AIM, IRC, Jabber and LiveJournal" +SECTION = "console/network" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "openssl ncurses" + +inherit autotools + +SRC_URI = "http://centericq.de/archive/source/releases/centericq-${PV}.tar.bz2 \ + file://configure.patch;patch=1 \ + file://m4.patch;patch=1" + +EXTRA_OECONF = "--with-ssl --with-openssl=${STAGING_LIBDIR}/.." diff --git a/packages/centericq/centericq_4.11.0.bb b/packages/centericq/centericq_4.11.0.bb index fa6633883b..dc227c4a93 100644 --- a/packages/centericq/centericq_4.11.0.bb +++ b/packages/centericq/centericq_4.11.0.bb @@ -1,15 +1,5 @@ -DEPENDS = "openssl ncurses" -DESCRIPTION = "An ncurses-based IM client for ICQ2000, Yahoo!, \ -AIM, IRC, Jabber and LiveJournal" -SECTION = "console/network" -SRC_URI = "http://centericq.de/archive/source/releases/centericq-${PV}.tar.bz2 \ - file://configure.patch;patch=1 \ - file://m4.patch;patch=1" -LICENSE = "GPL" +require centericq.inc -inherit autotools - -EXTRA_OECONF = "--with-ssl --with-openssl=${STAGING_LIBDIR}/.." acpaths = "-I ${S}/m4" # FIXME: ugly compile failures diff --git a/packages/centericq/centericq_4.9.10.bb b/packages/centericq/centericq_4.9.10.bb index 93e85b6c8b..6d02f2c787 100644 --- a/packages/centericq/centericq_4.9.10.bb +++ b/packages/centericq/centericq_4.9.10.bb @@ -1,12 +1,3 @@ -DEPENDS = "openssl ncurses" -DESCRIPTION = "An ncurses-based IM client for ICQ2000, Yahoo!, \ -AIM, IRC, Jabber and LiveJournal" -SECTION = "console/network" -SRC_URI = "http://centericq.de/archive/source/releases/centericq-${PV}.tar.bz2 \ - file://configure.patch;patch=1 \ - file://m4.patch;patch=1" -LICENSE = "GPL" -inherit autotools +require centericq.inc -EXTRA_OECONF = "--with-ssl --with-openssl=${STAGING_LIBDIR}/.." acpaths = "-I ${S}/m4" diff --git a/packages/centericq/centericq_4.9.7.bb b/packages/centericq/centericq_4.9.7.bb index 331d69c8d3..c4af2f4437 100644 --- a/packages/centericq/centericq_4.9.7.bb +++ b/packages/centericq/centericq_4.9.7.bb @@ -1,13 +1 @@ -DEPENDS = "openssl ncurses" -DESCRIPTION = "An ncurses-based IM client for ICQ2000, Yahoo!, \ -AIM, IRC, Jabber and LiveJournal" -SECTION = "console/network" -LICENSE = "GPL" - -SRC_URI = "http://centericq.de/archive/source/releases/centericq-${PV}.tar.bz2 \ - file://configure.patch;patch=1 \ - file://m4.patch;patch=1" - -inherit autotools - -EXTRA_OECONF = "--with-ssl --with-openssl=${STAGING_LIBDIR}/.." +require centericq.inc -- cgit v1.2.3 From e7ebc0058d9fd62e280b9d329e65ffc7f8d000f2 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Wed, 20 Dec 2006 23:35:55 +0000 Subject: coreutils: unify --- packages/coreutils/coreutils.inc | 7 +++++++ packages/coreutils/coreutils_5.0.bb | 9 ++------- packages/coreutils/coreutils_5.1.1.bb | 9 ++------- packages/coreutils/coreutils_5.1.3.bb | 9 ++------- packages/coreutils/coreutils_5.3.0.bb | 14 ++++---------- 5 files changed, 17 insertions(+), 31 deletions(-) create mode 100644 packages/coreutils/coreutils.inc diff --git a/packages/coreutils/coreutils.inc b/packages/coreutils/coreutils.inc new file mode 100644 index 0000000000..481c32bb3d --- /dev/null +++ b/packages/coreutils/coreutils.inc @@ -0,0 +1,7 @@ +DESCRIPTION = "A collection of core GNU utilities." +LICENSE = "GPL" +SECTION = "base" +RREPLACES = "textutils shellutils fileutils" +RPROVIDES = "textutils shellutils fileutils" + +inherit autotools diff --git a/packages/coreutils/coreutils_5.0.bb b/packages/coreutils/coreutils_5.0.bb index c0e94329f2..84fa38cef2 100644 --- a/packages/coreutils/coreutils_5.0.bb +++ b/packages/coreutils/coreutils_5.0.bb @@ -1,14 +1,9 @@ -LICENSE = "GPL" -SECTION = "base" -DESCRIPTION = "A collection of core GNU utilities." -RREPLACES = "textutils shellutils fileutils" -RPROVIDES = "textutils shellutils fileutils" +require coreutils.inc + PR = "r1" SRC_URI = "${GNU_MIRROR}/coreutils/coreutils-${PV}.tar.gz \ file://malloc.patch;patch=1 \ file://configure.patch;patch=1" -inherit autotools - export EXTRA_OEMAKE="'SUBDIRS=lib src doc m4 po tests' MAKEFLAGS=" diff --git a/packages/coreutils/coreutils_5.1.1.bb b/packages/coreutils/coreutils_5.1.1.bb index f517fc8067..40b9fe4744 100644 --- a/packages/coreutils/coreutils_5.1.1.bb +++ b/packages/coreutils/coreutils_5.1.1.bb @@ -1,10 +1,5 @@ -LICENSE = "GPL" -SECTION = "base" -DESCRIPTION = "A collection of core GNU utilities." -RREPLACES = "textutils shellutils fileutils" -RPROVIDES = "textutils shellutils fileutils" +require coreutils.inc + PR = "r1" SRC_URI = "ftp://alpha.gnu.org/gnu/coreutils/coreutils-${PV}.tar.bz2" - -inherit autotools diff --git a/packages/coreutils/coreutils_5.1.3.bb b/packages/coreutils/coreutils_5.1.3.bb index 2f7476c2dd..2277ae6bc7 100644 --- a/packages/coreutils/coreutils_5.1.3.bb +++ b/packages/coreutils/coreutils_5.1.3.bb @@ -1,8 +1,5 @@ -LICENSE = "GPL" -SECTION = "base" -DESCRIPTION = "A collection of core GNU utilities." -RREPLACES = "textutils shellutils fileutils" -RPROVIDES = "textutils shellutils fileutils" +require coreutils.inc + PR = "r8" SRC_URI = "ftp://alpha.gnu.org/gnu/coreutils/coreutils-${PV}.tar.bz2 \ @@ -10,8 +7,6 @@ SRC_URI = "ftp://alpha.gnu.org/gnu/coreutils/coreutils-${PV}.tar.bz2 \ file://man.patch;patch=1 \ file://rename-eaccess.patch;patch=1" -inherit autotools - # [ gets a special treatment and is not included in this bindir_progs = "basename cksum comm csplit cut dir dircolors dirname du \ env expand expr factor fmt fold groups head hostid id install \ diff --git a/packages/coreutils/coreutils_5.3.0.bb b/packages/coreutils/coreutils_5.3.0.bb index fa05a83781..6c2289b8f7 100644 --- a/packages/coreutils/coreutils_5.3.0.bb +++ b/packages/coreutils/coreutils_5.3.0.bb @@ -1,18 +1,12 @@ -DESCRIPTION = "A collection of core GNU utilities." -LICENSE = "GPL" -SECTION = "base" -RREPLACES = "textutils shellutils fileutils" -RPROVIDES = "textutils shellutils fileutils" +require coreutils.inc + PR = "r1" SRC_URI = "ftp://alpha.gnu.org/gnu/coreutils/coreutils-${PV}.tar.bz2 \ file://install-cross.patch;patch=1;pnum=0 \ file://man.patch;patch=1 \ - file://rename-tee-for-glibc2.5.patch;patch=1" - -SRC_URI += "file://uptime-pow-lib.patch;patch=1" - -inherit autotools + file://rename-tee-for-glibc2.5.patch;patch=1 \ + file://uptime-pow-lib.patch;patch=1" # [ gets a special treatment and is not included in this bindir_progs = "basename cksum comm csplit cut dir dircolors dirname du \ -- cgit v1.2.3 From 1089cc096ee6a8b200c37a8c736fff03ade6b108 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Wed, 20 Dec 2006 23:50:54 +0000 Subject: e2fsprogs: some unification --- packages/e2fsprogs/e2fsprogs.inc | 12 ++++++++++++ packages/e2fsprogs/e2fsprogs_1.33.bb | 14 +++----------- packages/e2fsprogs/e2fsprogs_1.34.bb | 13 +++---------- packages/e2fsprogs/e2fsprogs_1.35.bb | 13 +++---------- packages/e2fsprogs/e2fsprogs_1.38.bb | 15 +++++---------- 5 files changed, 26 insertions(+), 41 deletions(-) create mode 100644 packages/e2fsprogs/e2fsprogs.inc diff --git a/packages/e2fsprogs/e2fsprogs.inc b/packages/e2fsprogs/e2fsprogs.inc new file mode 100644 index 0000000000..6c3b287a39 --- /dev/null +++ b/packages/e2fsprogs/e2fsprogs.inc @@ -0,0 +1,12 @@ +DESCRIPTION = "EXT2 Filesystem Utilities" +HOMEPAGE = "http://e2fsprogs.sf.net" +LICENSE = "GPL" +SECTION = "base" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.gz" + +inherit autotools + +EXTRA_OECONF = " --enable-dynamic-e2fsck" + + diff --git a/packages/e2fsprogs/e2fsprogs_1.33.bb b/packages/e2fsprogs/e2fsprogs_1.33.bb index 63732aac4b..80572a0d41 100644 --- a/packages/e2fsprogs/e2fsprogs_1.33.bb +++ b/packages/e2fsprogs/e2fsprogs_1.33.bb @@ -1,20 +1,12 @@ -DESCRIPTION = "EXT2 Filesystem Utilities" -SECTION = "base" -LICENSE = "GPL" -PRIORITY = "optional" -DEPENDS = "" +require e2fsprogs.inc + PR = "r1" -SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \ - file://ln.patch;patch=1 \ +SRC_URI += "file://ln.patch;patch=1 \ file://configure.patch;patch=1 \ file://compile-subst.patch;patch=1 \ file://m4.patch;patch=1" -inherit autotools - -EXTRA_OECONF = "--enable-dynamic-e2fsck" - sbindir = "/sbin" PACKAGES_prepend = "e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck " diff --git a/packages/e2fsprogs/e2fsprogs_1.34.bb b/packages/e2fsprogs/e2fsprogs_1.34.bb index 9171d39c6b..837cf962a0 100644 --- a/packages/e2fsprogs/e2fsprogs_1.34.bb +++ b/packages/e2fsprogs/e2fsprogs_1.34.bb @@ -1,20 +1,13 @@ -DESCRIPTION = "EXT2 Filesystem Utilities" -LICENSE = "GPL" -SECTION = "base" -PRIORITY = "optional" +require e2fsprogs.inc + PR = "r1" -SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \ - file://ln.patch;patch=1 \ +SRC_URI += "file://ln.patch;patch=1 \ file://configure.patch;patch=1 \ file://compile-subst.patch;patch=1 \ file://m4.patch;patch=1 \ file://ldflags.patch;patch=1" -inherit autotools - -EXTRA_OECONF = "--enable-dynamic-e2fsck" - sbindir = "/sbin" PACKAGES_prepend = "e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck " diff --git a/packages/e2fsprogs/e2fsprogs_1.35.bb b/packages/e2fsprogs/e2fsprogs_1.35.bb index 9171d39c6b..837cf962a0 100644 --- a/packages/e2fsprogs/e2fsprogs_1.35.bb +++ b/packages/e2fsprogs/e2fsprogs_1.35.bb @@ -1,20 +1,13 @@ -DESCRIPTION = "EXT2 Filesystem Utilities" -LICENSE = "GPL" -SECTION = "base" -PRIORITY = "optional" +require e2fsprogs.inc + PR = "r1" -SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \ - file://ln.patch;patch=1 \ +SRC_URI += "file://ln.patch;patch=1 \ file://configure.patch;patch=1 \ file://compile-subst.patch;patch=1 \ file://m4.patch;patch=1 \ file://ldflags.patch;patch=1" -inherit autotools - -EXTRA_OECONF = "--enable-dynamic-e2fsck" - sbindir = "/sbin" PACKAGES_prepend = "e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-fsck " diff --git a/packages/e2fsprogs/e2fsprogs_1.38.bb b/packages/e2fsprogs/e2fsprogs_1.38.bb index ec28bff31a..a909419437 100644 --- a/packages/e2fsprogs/e2fsprogs_1.38.bb +++ b/packages/e2fsprogs/e2fsprogs_1.38.bb @@ -1,18 +1,13 @@ -DESCRIPTION = "EXT2 Filesystem Utilities" -HOMEPAGE = "http://e2fsprogs.sourceforge.net" -LICENSE = "GPL" -SECTION = "base" +require e2fsprogs.inc + PR = "r6" -SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \ - file://no-hardlinks.patch;patch=1" +SRC_URI += "file://no-hardlinks.patch;patch=1" S = "${WORKDIR}/e2fsprogs-${PV}" PARALLEL_MAKE = "" -inherit autotools - -EXTRA_OECONF = "--enable-dynamic-e2fsck --sbindir=${base_sbindir}" +EXTRA_OECONF += " --sbindir=${base_sbindir}" do_compile_prepend () { find ./ -print|xargs chmod u=rwX @@ -49,4 +44,4 @@ FILES_e2fsprogs-fsck = "${base_sbindir}/fsck" FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext*" FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs ${base_sbindir}/mkfs.ext*" FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs ${base_sbindir}/e2label ${base_sbindir}/findfs" -FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks" \ No newline at end of file +FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks" -- cgit v1.2.3 From 096236b22db5aa4fd7934cea49a8f0ac5c612f61 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Thu, 21 Dec 2006 00:23:33 +0000 Subject: e2fsprogs-libs: unify --- packages/e2fsprogs-libs/e2fsprogs-libs.inc | 31 ++++++++++++++++++++++++ packages/e2fsprogs-libs/e2fsprogs-libs_1.33.bb | 32 +------------------------ packages/e2fsprogs-libs/e2fsprogs-libs_1.34.bb | 33 ++------------------------ packages/e2fsprogs-libs/e2fsprogs-libs_1.35.bb | 32 ++----------------------- 4 files changed, 36 insertions(+), 92 deletions(-) create mode 100644 packages/e2fsprogs-libs/e2fsprogs-libs.inc diff --git a/packages/e2fsprogs-libs/e2fsprogs-libs.inc b/packages/e2fsprogs-libs/e2fsprogs-libs.inc new file mode 100644 index 0000000000..03f9c8dc22 --- /dev/null +++ b/packages/e2fsprogs-libs/e2fsprogs-libs.inc @@ -0,0 +1,31 @@ +DESCRIPTION = "EXT2 Filesystem Utilities" +LICENSE = "GPL" +SECTION = "base" +PRIORITY = "optional" + +inherit autotools + +SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \ + file://configure.patch;patch=1 \ + file://compile-subst.patch;patch=1 \ + file://m4.patch;patch=1" + +S = "${WORKDIR}/e2fsprogs-libs-${PV}" +FILES_e2fsprogs-libs-dev_append = " ${datadir}/et ${datadir}/ss" + +do_stage () { + for i in libcom_err libss libuuid libblkid; do + oe_libinstall -a -C lib $i ${STAGING_LIBDIR} + done + install -d ${STAGING_INCDIR}/et \ + ${STAGING_INCDIR}/ss \ + ${STAGING_INCDIR}/uuid \ + ${STAGING_INCDIR}/blkid + install -m 0644 lib/et/com_err.h ${STAGING_INCDIR}/et/ + install -m 0644 lib/ss/ss.h ${STAGING_INCDIR}/ss/ + install -m 0644 lib/ss/ss_err.h ${STAGING_INCDIR}/ss/ + install -m 0644 lib/uuid/uuid.h ${STAGING_INCDIR}/uuid/ + install -m 0644 lib/uuid/uuid_types.h ${STAGING_INCDIR}/uuid/ + install -m 0644 lib/blkid/blkid.h ${STAGING_INCDIR}/blkid/ + install -m 0644 lib/blkid/blkid_types.h ${STAGING_INCDIR}/blkid/ +} diff --git a/packages/e2fsprogs-libs/e2fsprogs-libs_1.33.bb b/packages/e2fsprogs-libs/e2fsprogs-libs_1.33.bb index 90ed15e3f0..38449667fe 100644 --- a/packages/e2fsprogs-libs/e2fsprogs-libs_1.33.bb +++ b/packages/e2fsprogs-libs/e2fsprogs-libs_1.33.bb @@ -1,31 +1 @@ -DESCRIPTION = "EXT2 Filesystem Utilities" -LICENSE = "GPL" -SECTION = "base" -PRIORITY = "optional" -DEPENDS = "" -FILES_e2fsprogs-libs-dev_append = " ${datadir}/et ${datadir}/ss" - -SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \ - file://configure.patch;patch=1 \ - file://compile-subst.patch;patch=1 \ - file://m4.patch;patch=1" -S = "${WORKDIR}/e2fsprogs-libs-${PV}" - -inherit autotools - -do_stage () { - for i in libcom_err libss libuuid libblkid; do - oe_libinstall -a -C lib $i ${STAGING_LIBDIR} - done - install -d ${STAGING_INCDIR}/et \ - ${STAGING_INCDIR}/ss \ - ${STAGING_INCDIR}/uuid \ - ${STAGING_INCDIR}/blkid - install -m 0644 lib/et/com_err.h ${STAGING_INCDIR}/et/ - install -m 0644 lib/ss/ss.h ${STAGING_INCDIR}/ss/ - install -m 0644 lib/ss/ss_err.h ${STAGING_INCDIR}/ss/ - install -m 0644 lib/uuid/uuid.h ${STAGING_INCDIR}/uuid/ - install -m 0644 lib/uuid/uuid_types.h ${STAGING_INCDIR}/uuid/ - install -m 0644 lib/blkid/blkid.h ${STAGING_INCDIR}/blkid/ - install -m 0644 lib/blkid/blkid_types.h ${STAGING_INCDIR}/blkid/ -} +require e2fsprogs-libs.inc diff --git a/packages/e2fsprogs-libs/e2fsprogs-libs_1.34.bb b/packages/e2fsprogs-libs/e2fsprogs-libs_1.34.bb index 4d4a432b22..738d1ee206 100644 --- a/packages/e2fsprogs-libs/e2fsprogs-libs_1.34.bb +++ b/packages/e2fsprogs-libs/e2fsprogs-libs_1.34.bb @@ -1,37 +1,8 @@ -DESCRIPTION = "EXT2 Filesystem Utilities" -LICENSE = "GPL" -SECTION = "base" -PRIORITY = "optional" -DEPENDS = "" -FILES_e2fsprogs-libs-dev_append = " ${datadir}/et ${datadir}/ss" +require e2fsprogs-libs.inc -SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \ - file://configure.patch;patch=1 \ - file://compile-subst.patch;patch=1 \ - file://m4.patch;patch=1 \ - file://ldflags.patch;patch=1" -S = "${WORKDIR}/e2fsprogs-libs-${PV}" - -inherit autotools +SRC_URI += "file://ldflags.patch;patch=1" do_compile_prepend () { find ./ -print|xargs chmod u=rwX ( cd util; ${BUILD_CC} subst.c -o subst ) } - -do_stage () { - for i in libcom_err libss libuuid libblkid; do - oe_libinstall -a -C lib $i ${STAGING_LIBDIR} - done - install -d ${STAGING_INCDIR}/et \ - ${STAGING_INCDIR}/ss \ - ${STAGING_INCDIR}/uuid \ - ${STAGING_INCDIR}/blkid - install -m 0644 lib/et/com_err.h ${STAGING_INCDIR}/et/ - install -m 0644 lib/ss/ss.h ${STAGING_INCDIR}/ss/ - install -m 0644 lib/ss/ss_err.h ${STAGING_INCDIR}/ss/ - install -m 0644 lib/uuid/uuid.h ${STAGING_INCDIR}/uuid/ - install -m 0644 lib/uuid/uuid_types.h ${STAGING_INCDIR}/uuid/ - install -m 0644 lib/blkid/blkid.h ${STAGING_INCDIR}/blkid/ - install -m 0644 lib/blkid/blkid_types.h ${STAGING_INCDIR}/blkid/ -} diff --git a/packages/e2fsprogs-libs/e2fsprogs-libs_1.35.bb b/packages/e2fsprogs-libs/e2fsprogs-libs_1.35.bb index 9809ac5a6e..0d7d25e2cc 100644 --- a/packages/e2fsprogs-libs/e2fsprogs-libs_1.35.bb +++ b/packages/e2fsprogs-libs/e2fsprogs-libs_1.35.bb @@ -1,17 +1,6 @@ -DESCRIPTION = "EXT2 Filesystem Utilities" -LICENSE = "GPL" -SECTION = "base" -PRIORITY = "optional" -FILES_e2fsprogs-libs-dev_append = " ${datadir}/et ${datadir}/ss" +require e2fsprogs-libs.inc -SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-libs-${PV}.tar.gz \ - file://configure.patch;patch=1 \ - file://compile-subst.patch;patch=1 \ - file://m4.patch;patch=1 \ - file://ldflags.patch;patch=1" -S = "${WORKDIR}/e2fsprogs-libs-${PV}" - -inherit autotools +SRC_URI += "file://ldflags.patch;patch=1" EXTRA_OECONF=" --enable-elf-shlibs " @@ -19,20 +8,3 @@ do_compile_prepend () { find ./ -print|xargs chmod u=rwX ( cd util; ${BUILD_CC} subst.c -o subst ) } - -do_stage () { - for i in libcom_err libss libuuid libblkid; do - oe_libinstall -a -C lib $i ${STAGING_LIBDIR} - done - install -d ${STAGING_INCDIR}/et \ - ${STAGING_INCDIR}/ss \ - ${STAGING_INCDIR}/uuid \ - ${STAGING_INCDIR}/blkid - install -m 0644 lib/et/com_err.h ${STAGING_INCDIR}/et/ - install -m 0644 lib/ss/ss.h ${STAGING_INCDIR}/ss/ - install -m 0644 lib/ss/ss_err.h ${STAGING_INCDIR}/ss/ - install -m 0644 lib/uuid/uuid.h ${STAGING_INCDIR}/uuid/ - install -m 0644 lib/uuid/uuid_types.h ${STAGING_INCDIR}/uuid/ - install -m 0644 lib/blkid/blkid.h ${STAGING_INCDIR}/blkid/ - install -m 0644 lib/blkid/blkid_types.h ${STAGING_INCDIR}/blkid/ -} -- cgit v1.2.3 From 28bc945bbd5340d58b3f299aa443d380619eb010 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Thu, 21 Dec 2006 00:38:50 +0000 Subject: expat: unify --- packages/expat/expat.inc | 13 +++++++++++++ packages/expat/expat_1.95.6.bb | 11 ++--------- packages/expat/expat_1.95.7.bb | 12 +++--------- packages/expat/expat_2.0.0.bb | 12 +++--------- 4 files changed, 21 insertions(+), 27 deletions(-) create mode 100644 packages/expat/expat.inc diff --git a/packages/expat/expat.inc b/packages/expat/expat.inc new file mode 100644 index 0000000000..3318efb6aa --- /dev/null +++ b/packages/expat/expat.inc @@ -0,0 +1,13 @@ +DESCRIPTION = "Jim Clarkes XML parser library." +HOMEPAGE = "http://expat.sf.net/" +SECTION = "libs" +LICENSE = "MIT" + +SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.gz \ + file://autotools.patch;patch=1" +S = "${WORKDIR}/expat-${PV}" + +export LTCC = "${CC}" + +inherit autotools + diff --git a/packages/expat/expat_1.95.6.bb b/packages/expat/expat_1.95.6.bb index a6ac0f5b00..576ad76a55 100644 --- a/packages/expat/expat_1.95.6.bb +++ b/packages/expat/expat_1.95.6.bb @@ -1,13 +1,6 @@ -SECTION = "libs" -DESCRIPTION = "Jim Clarkes XML parser library." -LICENSE = "MIT" -PR = "r1" - -SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.gz" -S = "${WORKDIR}/expat-${PV}" +require expat.inc -inherit autotools -export LTCC = "${CC}" +PR = "r1" do_stage () { install -m 0644 ${S}/lib/expat.h ${STAGING_INCDIR}/ diff --git a/packages/expat/expat_1.95.7.bb b/packages/expat/expat_1.95.7.bb index c3bbb8981b..a4dda4dcb6 100644 --- a/packages/expat/expat_1.95.7.bb +++ b/packages/expat/expat_1.95.7.bb @@ -1,15 +1,9 @@ -SECTION = "libs" -DESCRIPTION = "Jim Clarkes XML parser library." -HOMEPAGE = "http://expat.sourceforge.net/" -LICENSE = "MIT" +require expat.inc PR = "r1" -SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.gz \ - file://autotools.patch;patch=1" -S = "${WORKDIR}/expat-${PV}" +SRC_URI += "file://autotools.patch;patch=1" -inherit autotools lib_package -export LTCC = "${CC}" +inherit lib_package do_configure () { rm -f ${S}/conftools/libtool.m4 diff --git a/packages/expat/expat_2.0.0.bb b/packages/expat/expat_2.0.0.bb index 4f98d3cde9..48b2b4eb7d 100644 --- a/packages/expat/expat_2.0.0.bb +++ b/packages/expat/expat_2.0.0.bb @@ -1,15 +1,9 @@ -DESCRIPTION = "Jim Clarkes XML parser library." -HOMEPAGE = "http://expat.sourceforge.net/" -SECTION = "libs" -LICENSE = "MIT" +require expat.inc PR = "r2" -SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.gz \ - file://autotools.patch;patch=1" -S = "${WORKDIR}/expat-${PV}" +SRC_URI = "file://autotools.patch;patch=1" -inherit autotools lib_package -export LTCC = "${CC}" +inherit lib_package do_configure() { rm -f ${S}/conftools/libtool.m4 -- cgit v1.2.3 From 373c52d20c06479a59091293dbeb1cc22ed74dc4 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Thu, 21 Dec 2006 03:13:15 +0000 Subject: granule: unify, add CVS bb file --- packages/granule/granule.inc | 9 +++++++++ packages/granule/granule_1.2.2.bb | 10 +--------- packages/granule/granule_cvs.bb | 17 +++++++++++++++++ 3 files changed, 27 insertions(+), 9 deletions(-) create mode 100644 packages/granule/granule.inc create mode 100644 packages/granule/granule_cvs.bb diff --git a/packages/granule/granule.inc b/packages/granule/granule.inc new file mode 100644 index 0000000000..7f211b3de1 --- /dev/null +++ b/packages/granule/granule.inc @@ -0,0 +1,9 @@ +DESCRIPTION = "Generic memory training with flash cards. Automatic scheduling algorithm." +AUTHOR = "Vladislav Grinchenko " +HOMEPAGE = "http://granule.sf.net" +SECTION = "x11/apps" +PRIORITY = "optional" +LICENSE = "GPLv2" +DEPENDS = "glib-2.0-native intltool-native gtkmm libxml2 libassa" + +inherit autotools pkgconfig diff --git a/packages/granule/granule_1.2.2.bb b/packages/granule/granule_1.2.2.bb index 95f440c274..8e68118fa6 100644 --- a/packages/granule/granule_1.2.2.bb +++ b/packages/granule/granule_1.2.2.bb @@ -1,12 +1,4 @@ -DESCRIPTION = "Generic memory training with flash cards. Automatic scheduling algorithm." -AUTHOR = "Vladislav Grinchenko " -HOMEPAGE = "http://granule.sf.net" -SECTION = "x11/apps" -PRIORITY = "optional" -LICENSE = "GPLv2" -DEPENDS = "glib-2.0-native intltool-native gtkmm libxml2 libassa" -PR = "r0" +require granule.inc SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.gz" -inherit autotools pkgconfig diff --git a/packages/granule/granule_cvs.bb b/packages/granule/granule_cvs.bb new file mode 100644 index 0000000000..f4da91f840 --- /dev/null +++ b/packages/granule/granule_cvs.bb @@ -0,0 +1,17 @@ +require granule.inc + +PV = "1.2.4+cvs${SRCDATE}" + +EXTRA_OECONF_append_h3600 = " --enable-pda=yes " +EXTRA_OECONF_append_h3900 = " --enable-pda=yes " +EXTRA_OECONF_append_h2200 = " --enable-pda=yes " +EXTRA_OECONF_append_h4000 = " --enable-pda=yes " +EXTRA_OECONF_append_collie = " --enable-pda=yes " +EXTRA_OECONF_append_poodle = " --enable-pda=yes " +EXTRA_OECONF_append_mnci = " --enable-pda=yes " +EXTRA_OECONF_append_integral13 = " --enable-pda=yes " + +SRC_URI = "cvs://anonymous@granule.cvs.sourceforge.net/cvsroot/granule;method=pserver;module=granule" + +S = "${WORKDIR}/granule" + -- cgit v1.2.3 From 2e0c4e30549ba25d9a353cb2c8437d22da90c7cc Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 21 Dec 2006 09:13:13 +0000 Subject: glib-2.0: update to 2.12.6 * also create glib.inc --- packages/glib-2.0/glib-2.0_2.12.6.bb | 6 ++++++ packages/glib-2.0/glib.inc | 40 ++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 packages/glib-2.0/glib-2.0_2.12.6.bb create mode 100644 packages/glib-2.0/glib.inc diff --git a/packages/glib-2.0/glib-2.0_2.12.6.bb b/packages/glib-2.0/glib-2.0_2.12.6.bb new file mode 100644 index 0000000000..aae16bf2f5 --- /dev/null +++ b/packages/glib-2.0/glib-2.0_2.12.6.bb @@ -0,0 +1,6 @@ +require glib.inc + +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.12/glib-${PV}.tar.bz2 \ + file://glibconfig-sysdefs.h \ + file://configure-libtool.patch;patch=1" + diff --git a/packages/glib-2.0/glib.inc b/packages/glib-2.0/glib.inc new file mode 100644 index 0000000000..6a33291d52 --- /dev/null +++ b/packages/glib-2.0/glib.inc @@ -0,0 +1,40 @@ +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 " + +LEAD_SONAME = "libglib-2.0.*" +FILES_glib-2.0-utils = "${bindir}/*" + +EXTRA_OECONF = "--disable-debug" + +S = "${WORKDIR}/glib-${PV}" + +inherit autotools pkgconfig gettext + +require glib-2.0.inc + +acpaths = "" +do_configure_prepend () { + install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h . +} + +do_stage () { + oe_libinstall -so -C glib libglib-2.0 ${STAGING_LIBDIR} + oe_libinstall -so -C gmodule libgmodule-2.0 ${STAGING_LIBDIR} + oe_libinstall -so -C gthread libgthread-2.0 ${STAGING_LIBDIR} + oe_libinstall -so -C gobject libgobject-2.0 ${STAGING_LIBDIR} + autotools_stage_includes + 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 3fe155e8e7e33029f87eae1132f764998e9e7b4a Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 21 Dec 2006 09:15:54 +0000 Subject: pango: update to 1.15.2, create pango.inc Higlights from the announcement: * Optimizations: - Avoid some floating-point operations. Should cut the number of float ops per expose event in pangocairo to a half. - Cache ink and logical extents for PangoLayout --- packages/pango/pango.inc | 51 ++++++++++++++++++++++++++++++++++++++++++ packages/pango/pango_1.15.2.bb | 1 + 2 files changed, 52 insertions(+) create mode 100644 packages/pango/pango.inc create mode 100644 packages/pango/pango_1.15.2.bb diff --git a/packages/pango/pango.inc b/packages/pango/pango.inc new file mode 100644 index 0000000000..4b4d859372 --- /dev/null +++ b/packages/pango/pango.inc @@ -0,0 +1,51 @@ +DESCRIPTION = "The goal of the Pango project is to provide an \ +Open Source framework for the layout and rendering of \ +internationalized text." +LICENSE = "LGPL" + +inherit gnome + + +SECTION = "x11/libs" + +DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libx11 libxft gtk-doc cairo" + +PACKAGES_DYNAMIC = "pango-module-*" + +RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" + +# seems to go wrong with default cflags +FULL_OPTIMIZATION_arm = "-O2" + +SRC_URI += "file://no-tests.patch;patch=1 \ + " + +EXTRA_OECONF = "--disable-glibtest \ + --enable-explicit-deps=no \ + --disable-debug" + +LEAD_SONAME = "libpango-1.0*" +LIBV = "1.6.0" + +FILES_${PN} = "/etc ${bindir}/* ${libdir}/libpango*.so.*" +FILES_${PN}-dbg += "${libdir}/pango/${LIBV}/modules/.debug" +FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la" + +do_stage () { + autotools_stage_all +} + +postinst_prologue() { +if [ "x$D" != "x" ]; then + exit 1 +fi + +} + +python populate_packages_prepend () { + prologue = bb.data.getVar("postinst_prologue", d, 1) + + modules_root = bb.data.expand('${libdir}/pango/${LIBV}/modules', d) + + do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', prologue + 'pango-querymodules > /etc/pango/pango.modules') +} diff --git a/packages/pango/pango_1.15.2.bb b/packages/pango/pango_1.15.2.bb new file mode 100644 index 0000000000..8e3e8e7d3a --- /dev/null +++ b/packages/pango/pango_1.15.2.bb @@ -0,0 +1 @@ +require pango.inc -- cgit v1.2.3 From 5a1269e53c80708c3e3f53569791c66eab0cae12 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 21 Dec 2006 09:57:56 +0000 Subject: tune-thumb: add tune file to enable thumb stuff on armvXt --- conf/machine/include/tune-thumb.conf | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 conf/machine/include/tune-thumb.conf diff --git a/conf/machine/include/tune-thumb.conf b/conf/machine/include/tune-thumb.conf new file mode 100644 index 0000000000..862c2c3fcc --- /dev/null +++ b/conf/machine/include/tune-thumb.conf @@ -0,0 +1,2 @@ +TARGET_CC_ARCH += " -mthumb " + -- cgit v1.2.3 From 9dde123183e9b9aa5c637c77ae51845356fef9ad Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Thu, 21 Dec 2006 12:23:42 +0000 Subject: fuse: unify, clean up --- packages/fuse/fuse-module_2.5.3.bb | 33 +++++++++++++-------------------- packages/fuse/fuse.inc | 13 +++++++++++++ packages/fuse/fuse_2.5.3.bb | 18 ++---------------- packages/fuse/fuse_2.6.0.bb | 19 ++----------------- 4 files changed, 30 insertions(+), 53 deletions(-) create mode 100644 packages/fuse/fuse.inc diff --git a/packages/fuse/fuse-module_2.5.3.bb b/packages/fuse/fuse-module_2.5.3.bb index 4d582107bb..4c71b0b9f9 100644 --- a/packages/fuse/fuse-module_2.5.3.bb +++ b/packages/fuse/fuse-module_2.5.3.bb @@ -1,36 +1,29 @@ -HOMEPAGE = "http://fuse.sf.net" -DESCRIPTION = "With FUSE it is possible to implement a fully functional filesystem in a userspace program" +require fuse.inc -LICENSE = "GPL" - - -DEPENDS = "fakeroot-native" RRECOMMENDS = "fuse" - PR = "r1" -SRC_URI="${SOURCEFORGE_MIRROR}/fuse/fuse-${PV}.tar.gz" S = "${WORKDIR}/fuse-${PV}" - -inherit autotools pkgconfig module +FILES_${PN} = "/dev ${base_libdir}/modules ${sysconfdir}" EXTRA_OECONF = " --with-kernel=${STAGING_KERNEL_DIR}" +inherit module + do_configure() { -cd ${S} ; oe_runconf + cd ${S} ; oe_runconf } do_compile(){ -LDFLAGS="" -cd ${S}/kernel -oe_runmake + LDFLAGS="" + cd ${S}/kernel + oe_runmake } fakeroot do_install() { -LDFLAGS="" -install -d ${D}${sysconfdir}/udev/rules.d/ -install -m 644 util/udev.rules ${D}${sysconfdir}/udev/rules.d/ -cd ${S}/kernel -oe_runmake install DESTDIR=${D} + LDFLAGS="" + install -d ${D}${sysconfdir}/udev/rules.d/ + install -m 644 util/udev.rules ${D}${sysconfdir}/udev/rules.d/ + cd ${S}/kernel + oe_runmake install DESTDIR=${D} } -FILES_${PN} = "/dev ${base_libdir}/modules ${sysconfdir}" diff --git a/packages/fuse/fuse.inc b/packages/fuse/fuse.inc new file mode 100644 index 0000000000..abc408561a --- /dev/null +++ b/packages/fuse/fuse.inc @@ -0,0 +1,13 @@ +DESCRIPTION = "With FUSE it is possible to implement a fully functional filesystem in a userspace program" +HOMEPAGE = "http://fuse.sf.net" +LICENSE = "GPL" +DEPENDS = "fakeroot-native" +RRECOMMENDS_fuse = "fuse-module kernel-module-fuse" + +SRC_URI = "${SOURCEFORGE_MIRROR}/fuse/${P}.tar.gz" + +inherit autotools pkgconfig + +fakeroot do_install() { + oe_runmake install DESTDIR=${D} +} diff --git a/packages/fuse/fuse_2.5.3.bb b/packages/fuse/fuse_2.5.3.bb index b423e962ae..1f43ac8859 100644 --- a/packages/fuse/fuse_2.5.3.bb +++ b/packages/fuse/fuse_2.5.3.bb @@ -1,31 +1,17 @@ -HOMEPAGE = "http://fuse.sf.net" -DESCRIPTION = "With FUSE it is possible to implement a fully functional filesystem in a userspace program" - -LICENSE_${PN} = "LGPL" +require fuse.inc PR = "r1" -DEPENDS = "fakeroot-native" -RRECOMMENDS_${PN} = "fuse-module kernel-module-fuse" - #package utils in a sperate package and stop debian.bbclass renaming it to libfuse-utils, we want it to be fuse-utils PACKAGES += "fuse-utils" FILES_${PN} = "${libdir}/*.so*" FILES_${PN}-dev += "${libdir}/*.la" FILES_fuse-utils = "${bindir} ${base_sbindir}" DEBIAN_NOAUTONAME_fuse-utils = "1" - -SRC_URI="${SOURCEFORGE_MIRROR}/fuse/${P}.tar.gz" - -inherit autotools pkgconfig EXTRA_OECONF = " --disable-kernel-module" -fakeroot do_install() { -oe_runmake install DESTDIR=${D} -} - fakeroot do_stage() { -autotools_stage_all + autotools_stage_all } diff --git a/packages/fuse/fuse_2.6.0.bb b/packages/fuse/fuse_2.6.0.bb index 74dd994720..2d5809cd00 100644 --- a/packages/fuse/fuse_2.6.0.bb +++ b/packages/fuse/fuse_2.6.0.bb @@ -1,30 +1,15 @@ -DESCRIPTION = "With FUSE it is possible to implement a fully functional filesystem in a userspace program" -HOMEPAGE = "http://fuse.sf.net" -LICENSE = "LGPL" +require fuse.inc -PR = "r0" +SRC_URI += "file://not-run-updaterc.d-on-host.patch;patch=1" -DEPENDS = "fakeroot-native" -RRECOMMENDS_${PN} = "fuse-module kernel-module-fuse" - -SRC_URI = "${SOURCEFORGE_MIRROR}/fuse/${P}.tar.gz \ - file://not-run-updaterc.d-on-host.patch;patch=1" - - -inherit autotools pkgconfig EXTRA_OECONF = " --disable-kernel-module" -fakeroot do_install() { - oe_runmake install DESTDIR=${D} -} - #package utils in a sperate package and stop debian.bbclass renaming it to libfuse-utils, we want it to be fuse-utils PACKAGES =+ "lib${PN} libulockmgr" FILES_${PN}-dev += "${libdir}/*.la" FILES_lib${PN} = "${libdir}/libfuse*.so.*" FILES_libulockmgr = "${libdir}/libulockmgr.so.*" - fakeroot do_stage() { autotools_stage_all } -- cgit v1.2.3 From 356536b0c774ef86be6e68d6da95aaff0e231614 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 21 Dec 2006 14:27:39 +0000 Subject: binutils: update to 2.17.50.0.8 binutils-cross: ditto --- .../binutils/binutils-2.17.50.0.8/.mtn2git_empty | 0 .../binutils-2.17.50.0.8/110-arm-eabi-conf.patch | 24 ++++ ...tils-2.16.91.0.6-objcopy-rename-errorcode.patch | 31 +++++ .../binutils-uclibc-100-uclibc-conf.patch | 139 +++++++++++++++++++++ ...binutils-uclibc-300-001_ld_makefile_patch.patch | 50 ++++++++ ...binutils-uclibc-300-006_better_file_error.patch | 43 +++++++ ...ils-uclibc-300-012_check_ldrunpath_length.patch | 47 +++++++ packages/binutils/binutils-cross_2.17.50.0.8.bb | 32 +++++ packages/binutils/binutils_2.17.50.0.8.bb | 12 ++ 9 files changed, 378 insertions(+) create mode 100644 packages/binutils/binutils-2.17.50.0.8/.mtn2git_empty create mode 100644 packages/binutils/binutils-2.17.50.0.8/110-arm-eabi-conf.patch create mode 100644 packages/binutils/binutils-2.17.50.0.8/binutils-2.16.91.0.6-objcopy-rename-errorcode.patch create mode 100644 packages/binutils/binutils-2.17.50.0.8/binutils-uclibc-100-uclibc-conf.patch create mode 100644 packages/binutils/binutils-2.17.50.0.8/binutils-uclibc-300-001_ld_makefile_patch.patch create mode 100644 packages/binutils/binutils-2.17.50.0.8/binutils-uclibc-300-006_better_file_error.patch create mode 100644 packages/binutils/binutils-2.17.50.0.8/binutils-uclibc-300-012_check_ldrunpath_length.patch create mode 100644 packages/binutils/binutils-cross_2.17.50.0.8.bb create mode 100644 packages/binutils/binutils_2.17.50.0.8.bb diff --git a/packages/binutils/binutils-2.17.50.0.8/.mtn2git_empty b/packages/binutils/binutils-2.17.50.0.8/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/binutils/binutils-2.17.50.0.8/110-arm-eabi-conf.patch b/packages/binutils/binutils-2.17.50.0.8/110-arm-eabi-conf.patch new file mode 100644 index 0000000000..be85ceb109 --- /dev/null +++ b/packages/binutils/binutils-2.17.50.0.8/110-arm-eabi-conf.patch @@ -0,0 +1,24 @@ +diff -urN binutils-2.16.91.0.7.orig/configure binutils-2.16.91.0.7/configure +--- binutils-2.16.91.0.7.orig/configure 2006-05-31 14:54:24.000000000 +0300 ++++ binutils-2.16.91.0.7/configure 2006-05-31 14:55:53.000000000 +0300 +@@ -1299,7 +1299,7 @@ + arm-*-elf* | strongarm-*-elf* | xscale-*-elf* | arm*-*-eabi* ) + noconfigdirs="$noconfigdirs target-libffi target-qthreads" + ;; +- arm*-*-linux-gnueabi) ++ arm*-*-linux-gnueabi | arm*-*-linux-uclibcgnueabi) + noconfigdirs="$noconfigdirs target-libffi target-qthreads" + noconfigdirs="$noconfigdirs target-libjava target-libobjc" + ;; +diff -urN binutils-2.16.91.0.7.orig/configure.in binutils-2.16.91.0.7/configure.in +--- binutils-2.16.91.0.7.orig/configure.in 2006-05-31 14:54:24.000000000 +0300 ++++ binutils-2.16.91.0.7/configure.in 2006-05-31 14:55:53.000000000 +0300 +@@ -497,7 +497,7 @@ + arm-*-elf* | strongarm-*-elf* | xscale-*-elf* | arm*-*-eabi* ) + noconfigdirs="$noconfigdirs target-libffi target-qthreads" + ;; +- arm*-*-linux-gnueabi) ++ arm*-*-linux-gnueabi | arm*-*-linux-uclibcgnueabi) + noconfigdirs="$noconfigdirs target-libffi target-qthreads" + noconfigdirs="$noconfigdirs target-libjava target-libobjc" + ;; diff --git a/packages/binutils/binutils-2.17.50.0.8/binutils-2.16.91.0.6-objcopy-rename-errorcode.patch b/packages/binutils/binutils-2.17.50.0.8/binutils-2.16.91.0.6-objcopy-rename-errorcode.patch new file mode 100644 index 0000000000..4461bedd4e --- /dev/null +++ b/packages/binutils/binutils-2.17.50.0.8/binutils-2.16.91.0.6-objcopy-rename-errorcode.patch @@ -0,0 +1,31 @@ +# strip (and objcopy) fail to set the error code if there is no +# output file name and the rename of the stripped (or copied) file +# fails, yet the command fails to do anything. This fixes both +# objcopy and strip. +# +# modification by bero: Ported to 2.16.91.0.6 +# +#Signed-off-by: John Bowler +#Signed-off-by: Bernhard Rosenkraenzer +--- binutils-2.16.91.0.6/binutils/objcopy.c.ark 2006-03-11 15:59:07.000000000 +0100 ++++ binutils-2.16.91.0.6/binutils/objcopy.c 2006-03-11 15:59:45.000000000 +0100 +@@ -2593,7 +2593,8 @@ + if (preserve_dates) + set_times (tmpname, &statbuf); + if (output_file == NULL) +- smart_rename (tmpname, argv[i], preserve_dates); ++ if(smart_rename (tmpname, argv[i], preserve_dates)) ++ hold_status = 1; + status = hold_status; + } + else +@@ -3184,7 +3185,8 @@ + { + if (preserve_dates) + set_times (tmpname, &statbuf); +- smart_rename (tmpname, input_filename, preserve_dates); ++ if (smart_rename (tmpname, input_filename, preserve_dates)) ++ status = 1; + } + else + unlink (tmpname); diff --git a/packages/binutils/binutils-2.17.50.0.8/binutils-uclibc-100-uclibc-conf.patch b/packages/binutils/binutils-2.17.50.0.8/binutils-uclibc-100-uclibc-conf.patch new file mode 100644 index 0000000000..25222e5df2 --- /dev/null +++ b/packages/binutils/binutils-2.17.50.0.8/binutils-uclibc-100-uclibc-conf.patch @@ -0,0 +1,139 @@ +--- binutils-2.16.91.0.7/bfd/configure ++++ binutils-2.16.91.0.7/bfd/configure +@@ -3576,7 +3576,7 @@ + ;; + + # This must be Linux ELF. +-linux-gnu*) ++linux-gnu*|linux-uclibc*) + lt_cv_deplibs_check_method=pass_all + ;; + +--- binutils-2.16.91.0.7/binutils/configure ++++ binutils-2.16.91.0.7/binutils/configure +@@ -3411,7 +3411,7 @@ + ;; + + # This must be Linux ELF. +-linux-gnu*) ++linux-gnu*|linux-uclibc*) + lt_cv_deplibs_check_method=pass_all + ;; + +--- binutils-2.16.91.0.7/configure ++++ binutils-2.16.91.0.7/configure +@@ -1270,7 +1270,7 @@ + am33_2.0-*-linux*) + noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss" + ;; +- sh-*-linux*) ++ sh*-*-linux*) + noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss" + ;; + sh*-*-pe|mips*-*-pe|*arm-wince-pe) +@@ -1578,7 +1578,7 @@ + romp-*-*) + noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes target-libgloss ${libgcj}" + ;; +- sh-*-* | sh64-*-*) ++ sh*-*-* | sh64-*-*) + case "${host}" in + i[3456789]86-*-vsta) ;; # don't add gprof back in + i[3456789]86-*-go32*) ;; # don't add gprof back in +--- binutils-2.16.91.0.7/configure.in ++++ binutils-2.16.91.0.7/configure.in +@@ -468,7 +468,7 @@ + am33_2.0-*-linux*) + noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss" + ;; +- sh-*-linux*) ++ sh*-*-linux*) + noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss" + ;; + sh*-*-pe|mips*-*-pe|*arm-wince-pe) +@@ -776,7 +776,7 @@ + romp-*-*) + noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes target-libgloss ${libgcj}" + ;; +- sh-*-* | sh64-*-*) ++ sh*-*-* | sh64-*-*) + case "${host}" in + i[[3456789]]86-*-vsta) ;; # don't add gprof back in + i[[3456789]]86-*-go32*) ;; # don't add gprof back in +--- binutils-2.16.91.0.7/gas/configure ++++ binutils-2.16.91.0.7/gas/configure +@@ -3411,7 +3411,7 @@ + ;; + + # This must be Linux ELF. +-linux-gnu*) ++linux-gnu*|linux-uclibc*) + lt_cv_deplibs_check_method=pass_all + ;; + +--- binutils-2.16.91.0.7/gprof/configure ++++ binutils-2.16.91.0.7/gprof/configure +@@ -3419,6 +3419,11 @@ + lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` + ;; + ++linux-uclibc*) ++ lt_cv_deplibs_check_method=pass_all ++ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so` ++ ;; ++ + netbsd* | knetbsd*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$' +--- binutils-2.16.91.0.7/ld/configure ++++ binutils-2.16.91.0.7/ld/configure +@@ -3413,7 +3413,7 @@ + ;; + + # This must be Linux ELF. +-linux-gnu*) ++linux-gnu*|linux-uclibc*) + lt_cv_deplibs_check_method=pass_all + ;; + +--- binutils-2.16.91.0.7/libtool.m4 ++++ binutils-2.16.91.0.7/libtool.m4 +@@ -739,7 +739,7 @@ + ;; + + # This must be Linux ELF. +-linux-gnu*) ++linux-gnu*|linux-uclibc*) + lt_cv_deplibs_check_method=pass_all + ;; + +--- binutils-2.16.91.0.7/ltconfig ++++ binutils-2.16.91.0.7/ltconfig +@@ -602,6 +602,7 @@ + + # Transform linux* to *-*-linux-gnu*, to support old configure scripts. + case $host_os in ++linux-uclibc*) ;; + linux-gnu*) ;; + linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'` + esac +@@ -1247,7 +1248,7 @@ + ;; + + # This must be Linux ELF. +-linux-gnu*) ++linux-gnu*|linux-uclibc*) + version_type=linux + need_lib_prefix=no + need_version=no +--- binutils-2.16.91.0.7/opcodes/configure ++++ binutils-2.16.91.0.7/opcodes/configure +@@ -3579,7 +3579,7 @@ + ;; + + # This must be Linux ELF. +-linux-gnu*) ++linux-gnu*|linux-uclibc*) + lt_cv_deplibs_check_method=pass_all + ;; + diff --git a/packages/binutils/binutils-2.17.50.0.8/binutils-uclibc-300-001_ld_makefile_patch.patch b/packages/binutils/binutils-2.17.50.0.8/binutils-uclibc-300-001_ld_makefile_patch.patch new file mode 100644 index 0000000000..04a7e61e25 --- /dev/null +++ b/packages/binutils/binutils-2.17.50.0.8/binutils-uclibc-300-001_ld_makefile_patch.patch @@ -0,0 +1,50 @@ +#!/bin/sh -e +## 001_ld_makefile_patch.dpatch +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Description: correct where ld scripts are installed +## DP: Author: Chris Chimelis +## DP: Upstream status: N/A +## DP: Date: ?? + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +--- binutils-2.16.91.0.1/ld/Makefile.am ++++ binutils-2.16.91.0.1/ld/Makefile.am +@@ -20,7 +20,7 @@ + # We put the scripts in the directory $(scriptdir)/ldscripts. + # We can't put the scripts in $(datadir) because the SEARCH_DIR + # directives need to be different for native and cross linkers. +-scriptdir = $(tooldir)/lib ++scriptdir = $(libdir) + + EMUL = @EMUL@ + EMULATION_OFILES = @EMULATION_OFILES@ +--- binutils-2.16.91.0.1/ld/Makefile.in ++++ binutils-2.16.91.0.1/ld/Makefile.in +@@ -268,7 +268,7 @@ + # We put the scripts in the directory $(scriptdir)/ldscripts. + # We can't put the scripts in $(datadir) because the SEARCH_DIR + # directives need to be different for native and cross linkers. +-scriptdir = $(tooldir)/lib ++scriptdir = $(libdir) + BASEDIR = $(srcdir)/.. + BFDDIR = $(BASEDIR)/bfd + INCDIR = $(BASEDIR)/include diff --git a/packages/binutils/binutils-2.17.50.0.8/binutils-uclibc-300-006_better_file_error.patch b/packages/binutils/binutils-2.17.50.0.8/binutils-uclibc-300-006_better_file_error.patch new file mode 100644 index 0000000000..f337611edf --- /dev/null +++ b/packages/binutils/binutils-2.17.50.0.8/binutils-uclibc-300-006_better_file_error.patch @@ -0,0 +1,43 @@ +#!/bin/sh -e +## 006_better_file_error.dpatch by David Kimdon +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Specify which filename is causing an error if the filename is a +## DP: directory. (#45832) + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -urNad /home/james/debian/packages/binutils/binutils-2.14.90.0.6/bfd/opncls.c binutils-2.14.90.0.6/bfd/opncls.c +--- /home/james/debian/packages/binutils/binutils-2.14.90.0.6/bfd/opncls.c 2003-07-23 16:08:09.000000000 +0100 ++++ binutils-2.14.90.0.6/bfd/opncls.c 2003-09-10 22:35:00.000000000 +0100 +@@ -150,6 +150,13 @@ + { + bfd *nbfd; + const bfd_target *target_vec; ++ struct stat s; ++ ++ if (stat (filename, &s) == 0) ++ if (S_ISDIR(s.st_mode)) { ++ bfd_set_error (bfd_error_file_not_recognized); ++ return NULL; ++ } + + nbfd = _bfd_new_bfd (); + if (nbfd == NULL) diff --git a/packages/binutils/binutils-2.17.50.0.8/binutils-uclibc-300-012_check_ldrunpath_length.patch b/packages/binutils/binutils-2.17.50.0.8/binutils-uclibc-300-012_check_ldrunpath_length.patch new file mode 100644 index 0000000000..498651a90c --- /dev/null +++ b/packages/binutils/binutils-2.17.50.0.8/binutils-uclibc-300-012_check_ldrunpath_length.patch @@ -0,0 +1,47 @@ +#!/bin/sh -e +## 012_check_ldrunpath_length.dpatch by Chris Chimelis +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Only generate an RPATH entry if LD_RUN_PATH is not empty, for +## DP: cases where -rpath isn't specified. (#151024) + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -urNad /home/james/debian/packages/binutils/new/binutils-2.15/ld/emultempl/elf32.em binutils-2.15/ld/emultempl/elf32.em +--- /home/james/debian/packages/binutils/new/binutils-2.15/ld/emultempl/elf32.em 2004-05-21 23:12:58.000000000 +0100 ++++ binutils-2.15/ld/emultempl/elf32.em 2004-05-21 23:12:59.000000000 +0100 +@@ -692,6 +692,8 @@ + && command_line.rpath == NULL) + { + lib_path = (const char *) getenv ("LD_RUN_PATH"); ++ if ((lib_path) && (strlen (lib_path) == 0)) ++ lib_path = NULL; + if (gld${EMULATION_NAME}_search_needed (lib_path, &n, + force)) + break; +@@ -871,6 +873,8 @@ + rpath = command_line.rpath; + if (rpath == NULL) + rpath = (const char *) getenv ("LD_RUN_PATH"); ++ if ((rpath) && (strlen (rpath) == 0)) ++ rpath = NULL; + if (! (bfd_elf_size_dynamic_sections + (output_bfd, command_line.soname, rpath, + command_line.filter_shlib, diff --git a/packages/binutils/binutils-cross_2.17.50.0.8.bb b/packages/binutils/binutils-cross_2.17.50.0.8.bb new file mode 100644 index 0000000000..1f2f43ecf8 --- /dev/null +++ b/packages/binutils/binutils-cross_2.17.50.0.8.bb @@ -0,0 +1,32 @@ +SECTION = "devel" +require binutils_${PV}.bb +inherit cross +DEPENDS += "flex-native bison-native" +PROVIDES = "virtual/${TARGET_PREFIX}binutils" +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}" +PACKAGES = "" +EXTRA_OECONF = "--with-sysroot=${CROSS_DIR}/${TARGET_SYS} \ + --program-prefix=${TARGET_PREFIX}" + +do_stage () { + oe_runmake install + + # We don't really need these, so we'll remove them... + rm -rf ${CROSS_DIR}/lib/ldscripts + rm -rf ${CROSS_DIR}/share/info + rm -rf ${CROSS_DIR}/share/locale + rm -rf ${CROSS_DIR}/share/man + rmdir ${CROSS_DIR}/share || : + rmdir ${CROSS_DIR}/${libdir}/gcc-lib || : + rmdir ${CROSS_DIR}/${libdir} || : + rmdir ${CROSS_DIR}/${prefix} || : + + # We want to move this into the target specific location + mkdir -p ${CROSS_DIR}/${TARGET_SYS}/lib + mv -f ${CROSS_DIR}/lib/libiberty.a ${CROSS_DIR}/${TARGET_SYS}/lib + rmdir ${CROSS_DIR}/lib || : +} + +do_install () { + : +} diff --git a/packages/binutils/binutils_2.17.50.0.8.bb b/packages/binutils/binutils_2.17.50.0.8.bb new file mode 100644 index 0000000000..49bacac9c5 --- /dev/null +++ b/packages/binutils/binutils_2.17.50.0.8.bb @@ -0,0 +1,12 @@ +require binutils.inc + + +SRC_URI = \ + "${KERNELORG_MIRROR}/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \ + file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch;patch=1 \ + file://binutils-uclibc-100-uclibc-conf.patch;patch=1 \ + file://110-arm-eabi-conf.patch;patch=1 \ + file://binutils-uclibc-300-001_ld_makefile_patch.patch;patch=1 \ + file://binutils-uclibc-300-006_better_file_error.patch;patch=1 \ + file://binutils-uclibc-300-012_check_ldrunpath_length.patch;patch=1 \ + " -- cgit v1.2.3 From b7f57b9ab3093fa4a3258a5b309b14e8681bb5df Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 21 Dec 2006 14:51:30 +0000 Subject: tune-thumb: add more elaborate version which should allow setting ARM_INSTRUCTION_SET = "arm" in recipes as a killswitch, stolen from ixp4xx.conf --- conf/machine/include/tune-thumb.conf | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/conf/machine/include/tune-thumb.conf b/conf/machine/include/tune-thumb.conf index 862c2c3fcc..02c4fd0927 100644 --- a/conf/machine/include/tune-thumb.conf +++ b/conf/machine/include/tune-thumb.conf @@ -1,2 +1,32 @@ -TARGET_CC_ARCH += " -mthumb " +#tune file for thumb instructions + +ARM_INSTRUCTION_SET ?= "thumb" +# "arm" "thumb" +# The instruction set the compiler should use when generating application +# code. The kernel is always compiled with arm code at present. arm code +# is the original 32 bit ARM instruction set, thumb code is the 16 bit +# encoded RISC sub-set. Thumb code is smaller (maybe 70% of the ARM size) +# but requires more instructions (140% for 70% smaller code) so may be +# slower. + +THUMB_INTERWORK ?= "yes" +# "yes" "no" +# Whether to compile with code to allow interworking between the two +# instruction sets. This allows thumb code to be executed on a primarily +# arm system and vice versa. It is strongly recommended that DISTROs not +# turn this off - the actual cost is very small. + +OVERRIDE_THUMB = "${@['', ':thumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}" +OVERRIDE_INTERWORK = "${@['', ':thumb-interwork'][bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes']}" +OVERRIDES += "${OVERRIDE_THUMB}${OVERRIDE_INTERWORK}" + +# Compiler and linker options for application code and kernel code. These +# options ensure that the compiler has the correct settings for the selected +# instruction set and interworking. +ARM_INTERWORK_M_OPT = "${@['-mno-thumb-interwork', '-mthumb-interwork'][bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes']}" +ARM_THUMB_M_OPT = "${@['-mno-thumb', '-mthumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}" + +# +TARGET_CC_ARCH = + "${ARM_INTERWORK_M_OPT} ${ARM_THUMB_M_OPT}" +TARGET_CC_KERNEL_ARCH =+ "-mno-thumb" -- cgit v1.2.3 From 716fd1edbf1d83605e21ef5bd9411d5b4ca07b02 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 21 Dec 2006 15:02:33 +0000 Subject: tune-thumb: fix typos --- conf/machine/include/tune-thumb.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/machine/include/tune-thumb.conf b/conf/machine/include/tune-thumb.conf index 02c4fd0927..6f84f66405 100644 --- a/conf/machine/include/tune-thumb.conf +++ b/conf/machine/include/tune-thumb.conf @@ -27,6 +27,6 @@ ARM_INTERWORK_M_OPT = "${@['-mno-thumb-interwork', '-mthumb-interwork'][bb.data. ARM_THUMB_M_OPT = "${@['-mno-thumb', '-mthumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}" # -TARGET_CC_ARCH = + "${ARM_INTERWORK_M_OPT} ${ARM_THUMB_M_OPT}" -TARGET_CC_KERNEL_ARCH =+ "-mno-thumb" +TARGET_CC_ARCH += "${ARM_INTERWORK_M_OPT} ${ARM_THUMB_M_OPT}" +TARGET_CC_KERNEL_ARCH += "-mno-thumb" -- cgit v1.2.3 From 9922852899289409c04335fc9dd180bd98b9a2b2 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Thu, 21 Dec 2006 15:07:39 +0000 Subject: e2fsprogs: Replace ${PN} in .inc to make sure fetch does not break for native package. Thanks hrw. --- packages/e2fsprogs/e2fsprogs.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/e2fsprogs/e2fsprogs.inc b/packages/e2fsprogs/e2fsprogs.inc index 6c3b287a39..b6bb469cd3 100644 --- a/packages/e2fsprogs/e2fsprogs.inc +++ b/packages/e2fsprogs/e2fsprogs.inc @@ -3,7 +3,7 @@ HOMEPAGE = "http://e2fsprogs.sf.net" LICENSE = "GPL" SECTION = "base" -SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz" inherit autotools -- cgit v1.2.3 From a321a5f430c61eab2fa6bb5da6cba5e0fb263b54 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 21 Dec 2006 15:33:15 +0000 Subject: expat: repair some SRC_URI breakage expat-native: ditto --- packages/expat/expat.inc | 2 +- packages/expat/expat_2.0.0.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/expat/expat.inc b/packages/expat/expat.inc index 3318efb6aa..6d27b77b19 100644 --- a/packages/expat/expat.inc +++ b/packages/expat/expat.inc @@ -4,7 +4,7 @@ SECTION = "libs" LICENSE = "MIT" SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.gz \ - file://autotools.patch;patch=1" + " S = "${WORKDIR}/expat-${PV}" export LTCC = "${CC}" diff --git a/packages/expat/expat_2.0.0.bb b/packages/expat/expat_2.0.0.bb index 48b2b4eb7d..0fd825ee24 100644 --- a/packages/expat/expat_2.0.0.bb +++ b/packages/expat/expat_2.0.0.bb @@ -1,7 +1,7 @@ require expat.inc PR = "r2" -SRC_URI = "file://autotools.patch;patch=1" +SRC_URI += "file://autotools.patch;patch=1" inherit lib_package -- cgit v1.2.3 From 1719bf23ef92332b7c8a3d15b5b1afa17759d58b Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 21 Dec 2006 15:51:02 +0000 Subject: angstrom-version: make machine specific --- packages/angstrom/angstrom-version.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/angstrom/angstrom-version.bb b/packages/angstrom/angstrom-version.bb index e6545117b8..2488255b53 100644 --- a/packages/angstrom/angstrom-version.bb +++ b/packages/angstrom/angstrom-version.bb @@ -1,6 +1,7 @@ PV = "${DISTRO_VERSION}" PACKAGES = "${PN}" +PACKAGE_ARCH = "${MACHINE_ARCH}" do_compile() { mkdir -p ${D}${sysconfdir} -- cgit v1.2.3 From 5b42648d60364f79a0b81d8a8baa90d29323d76f Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 21 Dec 2006 16:00:01 +0000 Subject: pango.inc: small tweak to make building from scratch work --- packages/pango/pango.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pango/pango.inc b/packages/pango/pango.inc index 4b4d859372..e73fecbfb2 100644 --- a/packages/pango/pango.inc +++ b/packages/pango/pango.inc @@ -4,7 +4,7 @@ internationalized text." LICENSE = "LGPL" inherit gnome - +EXTRA_AUTORECONF = "" SECTION = "x11/libs" -- cgit v1.2.3 From c343bf2c5839eb67855e8f3bbf356037ff7fc886 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 21 Dec 2006 16:04:06 +0000 Subject: glibc 2.5: for some reason (#1708) glibc doesn't like thumb, so set ARM_INSTRUCTION_SET = "arm" --- packages/glibc/glibc_2.5.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/glibc/glibc_2.5.bb b/packages/glibc/glibc_2.5.bb index d3c6ab02ec..23230392e9 100644 --- a/packages/glibc/glibc_2.5.bb +++ b/packages/glibc/glibc_2.5.bb @@ -1,5 +1,7 @@ require glibc.inc +ARM_INSTRUCTION_SET = "arm" + PR = "r4" # the -isystem in bitbake.conf screws up glibc do_stage -- cgit v1.2.3 From 037b00e3d629962e8d2bc4fcc944c9ecf9a240be Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 21 Dec 2006 16:33:21 +0000 Subject: libgcrypt: disable thumb for thumb capable CPUs --- packages/libgcrypt/libgcrypt_1.2.3.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/libgcrypt/libgcrypt_1.2.3.bb b/packages/libgcrypt/libgcrypt_1.2.3.bb index 3f4942cae5..3cca30a6bb 100644 --- a/packages/libgcrypt/libgcrypt_1.2.3.bb +++ b/packages/libgcrypt/libgcrypt_1.2.3.bb @@ -14,6 +14,8 @@ inherit autotools binconfig EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities" +ARM_INSTRUCTION_SET = "arm" + do_stage() { oe_libinstall -so -C src libgcrypt ${STAGING_LIBDIR} oe_libinstall -so -C src libgcrypt-pthread ${STAGING_LIBDIR} -- cgit v1.2.3 From 2e42e0b62c93c454332403036baffca348dfd06d Mon Sep 17 00:00:00 2001 From: Stelios Koroneos Date: Thu, 21 Dec 2006 16:43:01 +0000 Subject: This fix allows uclibc-initial-0.9.28 to compile and closes bug #1632 --- packages/uclibc/uclibc.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/uclibc/uclibc.inc b/packages/uclibc/uclibc.inc index 1a829a3640..d81cfc636a 100644 --- a/packages/uclibc/uclibc.inc +++ b/packages/uclibc/uclibc.inc @@ -121,7 +121,7 @@ do_configure() { oe_runmake oldconfig } -do_install_prepend() { +do_stage() { # Install into the cross dir (this MUST be done first because we # will install crt1.o in the install_dev stage and gcc needs it) oe_runmake PREFIX= DEVEL_PREFIX=${UCLIBC_PREFIX}/ \ -- cgit v1.2.3 From 9e8c7b70df3478246249f987c9388b3cd00cb8c5 Mon Sep 17 00:00:00 2001 From: Stelios Koroneos Date: Thu, 21 Dec 2006 16:46:40 +0000 Subject: Set corect path to kernel headers for uclibc_svn Add patch to allow gettext to compile --- packages/uclibc/uclibc-cvs/error_print_progname.patch | 11 +++++++++++ packages/uclibc/uclibc_svn.bb | 6 +++--- 2 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 packages/uclibc/uclibc-cvs/error_print_progname.patch diff --git a/packages/uclibc/uclibc-cvs/error_print_progname.patch b/packages/uclibc/uclibc-cvs/error_print_progname.patch new file mode 100644 index 0000000000..6c10ec6b3c --- /dev/null +++ b/packages/uclibc/uclibc-cvs/error_print_progname.patch @@ -0,0 +1,11 @@ +--- /libc/misc/error/orig-error.c 2006-11-29 14:28:13.000000000 -0500 ++++ /libc/misc/error/error.c 2006-12-20 22:54:16.000000000 -0500 +@@ -44,7 +44,7 @@ + /* If NULL, error will flush stdout, then print on stderr the program + name, a colon and a space. Otherwise, error will call this + function without parameters instead. */ +-/* void (*error_print_progname) (void) = NULL; */ ++ void (*error_print_progname) (void) = NULL; + + extern __typeof(error) __error attribute_hidden; + void __error (int status, int errnum, const char *message, ...) diff --git a/packages/uclibc/uclibc_svn.bb b/packages/uclibc/uclibc_svn.bb index 568f8d46ee..10855e6749 100644 --- a/packages/uclibc/uclibc_svn.bb +++ b/packages/uclibc/uclibc_svn.bb @@ -21,12 +21,12 @@ PROVIDES += "virtual/${TARGET_PREFIX}libc-for-gcc" PACKAGE_ARCH = "${MACHINE_ARCH}" FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-cvs', '${FILE_DIRNAME}/uclibc-${UCLIBC_BASE}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" -# This is the correct KERNEL_SOURCE location, if the uClibc -# fix_includes.sh script is run (see nokernelheader.patch below) -# this must be correct. +#as stated above, uclibc needs real kernel-headers +#however: we can't depend on virtual/kernel when nptl hits due to depends deadlocking .... KERNEL_SOURCE = "${CROSS_DIR}/${TARGET_SYS}" SRC_URI += "svn://uclibc.org/trunk;module=uClibc" +SRC_URI += " file://error_print_progname.patch;patch=1" S = "${WORKDIR}/uClibc" -- cgit v1.2.3 From f72685da0c907904e206bdbdf62eb19986b165f4 Mon Sep 17 00:00:00 2001 From: Stelios Koroneos Date: Thu, 21 Dec 2006 16:49:56 +0000 Subject: dht-walnut uclibc_svn config file --- .../uclibc/uclibc-cvs/dht-walnut/.mtn2git_empty | 0 .../uclibc/uclibc-cvs/dht-walnut/uClibc.config | 181 +++++++++++++++++++++ 2 files changed, 181 insertions(+) create mode 100644 packages/uclibc/uclibc-cvs/dht-walnut/.mtn2git_empty create mode 100644 packages/uclibc/uclibc-cvs/dht-walnut/uClibc.config diff --git a/packages/uclibc/uclibc-cvs/dht-walnut/.mtn2git_empty b/packages/uclibc/uclibc-cvs/dht-walnut/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/uclibc/uclibc-cvs/dht-walnut/uClibc.config b/packages/uclibc/uclibc-cvs/dht-walnut/uClibc.config new file mode 100644 index 0000000000..6e606f6be3 --- /dev/null +++ b/packages/uclibc/uclibc-cvs/dht-walnut/uClibc.config @@ -0,0 +1,181 @@ +# +# Automatically generated make config: don't edit +# Wed Dec 20 21:41:18 2006 +# +# TARGET_alpha is not set +# TARGET_arm is not set +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +TARGET_powerpc=y +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="powerpc" +FORCE_OPTIONS_FOR_ARCH=y +ARCH_BIG_ENDIAN=y + +# +# Using Big Endian +# +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +# UCLIBC_HAS_FPU is not set +UCLIBC_HAS_SOFT_FLOAT=y +DO_C99_MATH=y +KERNEL_SOURCE="/usr/src/oplinux/oplinux-0.2/dht/build/tmp/cross/powerpc-linux-uclibc" +HAVE_DOT_CONFIG=y + +# +# General Library Settings +# +# HAVE_NO_PIC is not set +DOPIC=y +# HAVE_NO_SHARED is not set +# ARCH_HAS_NO_LDSO is not set +HAVE_SHARED=y +# FORCE_SHAREABLE_TEXT_SEGMENTS is not set +LDSO_LDD_SUPPORT=y +LDSO_CACHE_SUPPORT=y +# LDSO_PRELOAD_FILE_SUPPORT is not set +LDSO_BASE_FILENAME="ld.so" +# UCLIBC_STATIC_LDCONFIG is not set +LDSO_RUNPATH=y +UCLIBC_CTOR_DTOR=y +# HAS_NO_THREADS is not set +UCLIBC_HAS_THREADS=y +PTHREADS_DEBUG_SUPPORT=y +LINUXTHREADS_OLD=y +UCLIBC_HAS_LFS=y +# MALLOC is not set +# MALLOC_SIMPLE is not set +MALLOC_STANDARD=y +MALLOC_GLIBC_COMPAT=y +UCLIBC_DYNAMIC_ATEXIT=y +COMPAT_ATEXIT=y +UCLIBC_SUSV3_LEGACY=y +UCLIBC_HAS_SHADOW=y +UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y +UCLIBC_HAS___PROGNAME=y +UNIX98PTY_ONLY=y +ASSUME_DEVPTS=y +UCLIBC_HAS_TM_EXTENSIONS=y +UCLIBC_HAS_TZ_CACHING=y +UCLIBC_HAS_TZ_FILE=y +UCLIBC_HAS_TZ_FILE_READ_MANY=y +UCLIBC_TZ_FILE_PATH="/etc/TZ" + +# +# Networking Support +# +UCLIBC_HAS_IPV6=y +UCLIBC_HAS_RPC=y +UCLIBC_HAS_FULL_RPC=y +UCLIBC_HAS_REENTRANT_RPC=y +UCLIBC_USE_NETLINK=y + +# +# String and Stdio Support +# +UCLIBC_HAS_STRING_GENERIC_OPT=y +UCLIBC_HAS_STRING_ARCH_OPT=y +UCLIBC_HAS_CTYPE_TABLES=y +UCLIBC_HAS_CTYPE_SIGNED=y +# UCLIBC_HAS_CTYPE_UNSAFE is not set +UCLIBC_HAS_CTYPE_CHECKED=y +# UCLIBC_HAS_CTYPE_ENFORCED is not set +UCLIBC_HAS_WCHAR=y +# UCLIBC_HAS_LOCALE is not set +UCLIBC_HAS_HEXADECIMAL_FLOATS=y +UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y +UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9 +UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y +# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set +UCLIBC_HAS_STDIO_BUFSIZ_256=y +# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set +# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set +# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set +# UCLIBC_HAS_STDIO_BUFSIZ_4096 is not set +# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set +UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y +# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set +# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set +# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set +UCLIBC_HAS_STDIO_GETC_MACRO=y +UCLIBC_HAS_STDIO_PUTC_MACRO=y +UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y +# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set +UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y +UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y +UCLIBC_HAS_PRINTF_M_SPEC=y +UCLIBC_HAS_ERRNO_MESSAGES=y +# UCLIBC_HAS_SYS_ERRLIST is not set +UCLIBC_HAS_SIGNUM_MESSAGES=y +# UCLIBC_HAS_SYS_SIGLIST is not set +UCLIBC_HAS_GNU_GETOPT=y +UCLIBC_HAS_GNU_GETSUBOPT=y + +# +# Big and Tall +# +UCLIBC_HAS_REGEX=y +UCLIBC_HAS_REGEX_OLD=y +UCLIBC_HAS_FNMATCH=y +UCLIBC_HAS_FNMATCH_OLD=y +UCLIBC_HAS_WORDEXP=y +UCLIBC_HAS_FTW=y +UCLIBC_HAS_GLOB=y +# UCLIBC_HAS_GNU_GLOB is not set + +# +# Library Installation Options +# +SHARED_LIB_LOADER_PREFIX="/lib" +RUNTIME_PREFIX="/" +DEVEL_PREFIX="//usr" + +# +# Security options +# +# UCLIBC_BUILD_PIE is not set +# UCLIBC_HAS_ARC4RANDOM is not set +# HAVE_NO_SSP is not set +# UCLIBC_HAS_SSP is not set +UCLIBC_BUILD_RELRO=y +# UCLIBC_BUILD_NOW is not set +UCLIBC_BUILD_NOEXECSTACK=y + +# +# uClibc development/debugging options +# +CROSS_COMPILER_PREFIX="" +# DODEBUG is not set +# DODEBUG_PT is not set +DOSTRIP=y +# DOASSERTS is not set +# SUPPORT_LD_DEBUG is not set +# SUPPORT_LD_DEBUG_EARLY is not set +# UCLIBC_MALLOC_DEBUGGING is not set +WARNINGS="-Wall" +# EXTRA_WARNINGS is not set +# DOMULTI is not set +# UCLIBC_MJN3_ONLY is not set -- cgit v1.2.3 From 9a945e873e73ba51934f0618900c5000d56806e6 Mon Sep 17 00:00:00 2001 From: Stelios Koroneos Date: Thu, 21 Dec 2006 16:50:27 +0000 Subject: Efika uclibc_svn config file --- packages/uclibc/uclibc-cvs/efika/.mtn2git_empty | 0 packages/uclibc/uclibc-cvs/efika/uClibc.config | 180 ++++++++++++++++++++++++ 2 files changed, 180 insertions(+) create mode 100644 packages/uclibc/uclibc-cvs/efika/.mtn2git_empty create mode 100644 packages/uclibc/uclibc-cvs/efika/uClibc.config diff --git a/packages/uclibc/uclibc-cvs/efika/.mtn2git_empty b/packages/uclibc/uclibc-cvs/efika/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/uclibc/uclibc-cvs/efika/uClibc.config b/packages/uclibc/uclibc-cvs/efika/uClibc.config new file mode 100644 index 0000000000..23b221d662 --- /dev/null +++ b/packages/uclibc/uclibc-cvs/efika/uClibc.config @@ -0,0 +1,180 @@ +# +# Automatically generated make config: don't edit +# Wed Dec 20 11:05:48 2006 +# +# TARGET_alpha is not set +# TARGET_arm is not set +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +TARGET_powerpc=y +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="powerpc" +FORCE_OPTIONS_FOR_ARCH=y +ARCH_BIG_ENDIAN=y + +# +# Using Big Endian +# +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +UCLIBC_HAS_FPU=y +DO_C99_MATH=y +KERNEL_SOURCE="/usr/src/oplinux/oplinux-0.2/dht/build/tmp/staging/dht-walnut-linux-uclibc/kernel" +HAVE_DOT_CONFIG=y + +# +# General Library Settings +# +# HAVE_NO_PIC is not set +DOPIC=y +# HAVE_NO_SHARED is not set +# ARCH_HAS_NO_LDSO is not set +HAVE_SHARED=y +# FORCE_SHAREABLE_TEXT_SEGMENTS is not set +LDSO_LDD_SUPPORT=y +LDSO_CACHE_SUPPORT=y +# LDSO_PRELOAD_FILE_SUPPORT is not set +LDSO_BASE_FILENAME="ld.so" +# UCLIBC_STATIC_LDCONFIG is not set +LDSO_RUNPATH=y +UCLIBC_CTOR_DTOR=y +# HAS_NO_THREADS is not set +UCLIBC_HAS_THREADS=y +PTHREADS_DEBUG_SUPPORT=y +LINUXTHREADS_OLD=y +UCLIBC_HAS_LFS=y +# MALLOC is not set +# MALLOC_SIMPLE is not set +MALLOC_STANDARD=y +MALLOC_GLIBC_COMPAT=y +UCLIBC_DYNAMIC_ATEXIT=y +# COMPAT_ATEXIT is not set +# UCLIBC_SUSV3_LEGACY is not set +UCLIBC_HAS_SHADOW=y +UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y +UCLIBC_HAS___PROGNAME=y +UNIX98PTY_ONLY=y +ASSUME_DEVPTS=y +UCLIBC_HAS_TM_EXTENSIONS=y +UCLIBC_HAS_TZ_CACHING=y +UCLIBC_HAS_TZ_FILE=y +UCLIBC_HAS_TZ_FILE_READ_MANY=y +UCLIBC_TZ_FILE_PATH="/etc/TZ" + +# +# Networking Support +# +UCLIBC_HAS_IPV6=y +UCLIBC_HAS_RPC=y +UCLIBC_HAS_FULL_RPC=y +UCLIBC_HAS_REENTRANT_RPC=y +UCLIBC_USE_NETLINK=y + +# +# String and Stdio Support +# +UCLIBC_HAS_STRING_GENERIC_OPT=y +UCLIBC_HAS_STRING_ARCH_OPT=y +UCLIBC_HAS_CTYPE_TABLES=y +UCLIBC_HAS_CTYPE_SIGNED=y +# UCLIBC_HAS_CTYPE_UNSAFE is not set +UCLIBC_HAS_CTYPE_CHECKED=y +# UCLIBC_HAS_CTYPE_ENFORCED is not set +UCLIBC_HAS_WCHAR=y +# UCLIBC_HAS_LOCALE is not set +UCLIBC_HAS_HEXADECIMAL_FLOATS=y +UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y +UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9 +UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y +# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set +UCLIBC_HAS_STDIO_BUFSIZ_256=y +# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set +# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set +# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set +# UCLIBC_HAS_STDIO_BUFSIZ_4096 is not set +# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set +UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y +# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set +# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set +# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set +UCLIBC_HAS_STDIO_GETC_MACRO=y +UCLIBC_HAS_STDIO_PUTC_MACRO=y +UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y +# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set +UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y +UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y +UCLIBC_HAS_PRINTF_M_SPEC=y +UCLIBC_HAS_ERRNO_MESSAGES=y +# UCLIBC_HAS_SYS_ERRLIST is not set +UCLIBC_HAS_SIGNUM_MESSAGES=y +# UCLIBC_HAS_SYS_SIGLIST is not set +UCLIBC_HAS_GNU_GETOPT=y +UCLIBC_HAS_GNU_GETSUBOPT=y + +# +# Big and Tall +# +UCLIBC_HAS_REGEX=y +UCLIBC_HAS_REGEX_OLD=y +UCLIBC_HAS_FNMATCH=y +UCLIBC_HAS_FNMATCH_OLD=y +UCLIBC_HAS_WORDEXP=y +UCLIBC_HAS_FTW=y +UCLIBC_HAS_GLOB=y +# UCLIBC_HAS_GNU_GLOB is not set + +# +# Library Installation Options +# +SHARED_LIB_LOADER_PREFIX="/lib" +RUNTIME_PREFIX="/" +DEVEL_PREFIX="//usr" + +# +# Security options +# +# UCLIBC_BUILD_PIE is not set +# UCLIBC_HAS_ARC4RANDOM is not set +# HAVE_NO_SSP is not set +# UCLIBC_HAS_SSP is not set +UCLIBC_BUILD_RELRO=y +# UCLIBC_BUILD_NOW is not set +UCLIBC_BUILD_NOEXECSTACK=y + +# +# uClibc development/debugging options +# +CROSS_COMPILER_PREFIX="" +# DODEBUG is not set +# DODEBUG_PT is not set +DOSTRIP=y +# DOASSERTS is not set +# SUPPORT_LD_DEBUG is not set +# SUPPORT_LD_DEBUG_EARLY is not set +# UCLIBC_MALLOC_DEBUGGING is not set +WARNINGS="-Wall" +# EXTRA_WARNINGS is not set +# DOMULTI is not set +# UCLIBC_MJN3_ONLY is not set -- cgit v1.2.3 From c11d5f53a075464c9902a3c821665a6047b6e7e1 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 21 Dec 2006 17:34:58 +0000 Subject: xserver-kdrive: disable thumb using ARM_INSTRUCTION_SET = "arm" --- packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb index c563c48f29..38172cc425 100644 --- a/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb +++ b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb @@ -54,6 +54,8 @@ S = "${WORKDIR}/xorg-server-X11R7.1-1.1.0" inherit autotools pkgconfig +ARM_INSTRUCTION_SET = "arm" + W100_OECONF = "--disable-w100" W100_OECONF_arm = "--enable-w100" -- cgit v1.2.3 From dd30e414ebd7fc793d7c067c90f94359927ad43b Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 21 Dec 2006 18:49:51 +0000 Subject: gmp.inc: disable thumb via ARM_INSTRUCTION_SET = "arm" --- packages/gmp/gmp.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/gmp/gmp.inc b/packages/gmp/gmp.inc index ad179165f3..71ea128bc5 100644 --- a/packages/gmp/gmp.inc +++ b/packages/gmp/gmp.inc @@ -9,6 +9,8 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/gmp/gmp-${PV}.tar.bz2 \ inherit autotools +ARM_INSTRUCTION_SET = "arm" + acpaths = "" do_stage () { -- cgit v1.2.3 From 309448c08ed867660018554a9ee23b7af3bb5e21 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 21 Dec 2006 19:22:45 +0000 Subject: tune-thumb: convert to negative logic --- conf/machine/include/tune-thumb.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/machine/include/tune-thumb.conf b/conf/machine/include/tune-thumb.conf index 6f84f66405..2a12443b3d 100644 --- a/conf/machine/include/tune-thumb.conf +++ b/conf/machine/include/tune-thumb.conf @@ -1,6 +1,6 @@ #tune file for thumb instructions -ARM_INSTRUCTION_SET ?= "thumb" +ARM_INSTRUCTION_SET ?= "arm" # "arm" "thumb" # The instruction set the compiler should use when generating application # code. The kernel is always compiled with arm code at present. arm code @@ -9,7 +9,7 @@ ARM_INSTRUCTION_SET ?= "thumb" # but requires more instructions (140% for 70% smaller code) so may be # slower. -THUMB_INTERWORK ?= "yes" +THUMB_INTERWORK ?= "no" # "yes" "no" # Whether to compile with code to allow interworking between the two # instruction sets. This allows thumb code to be executed on a primarily -- cgit v1.2.3 From 9aa7e3d378be0357b0e42acad83664cadf3c70f5 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 21 Dec 2006 20:49:33 +0000 Subject: removal.txt : added familiar-unstable.conf --- removal.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/removal.txt b/removal.txt index f16f7c79d3..7c09fded9f 100644 --- a/removal.txt +++ b/removal.txt @@ -31,4 +31,10 @@ Maintainer: None Reason: Conflicting namespace with gstreamer 0.10 at build time Proposed by: Koen Kooi +Package Name: familiar-unstable.conf +Removal Date: 2007-01-31 +Maintainer: None +Reason: Familiar has forked and the conf files in OE are no longer + maintained. This is causing a support problem for oe devs. +Proposed by: Graeme Gregory (XorA) -- cgit v1.2.3 From 0c56028ff0d33748c3a8467f298f8770d7b2705a Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 21 Dec 2006 22:22:05 +0000 Subject: apr-util: stage everything --- packages/apr/apr-util_1.2.7.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/apr/apr-util_1.2.7.bb b/packages/apr/apr-util_1.2.7.bb index 2c9008c6f0..c73eb8023c 100644 --- a/packages/apr/apr-util_1.2.7.bb +++ b/packages/apr/apr-util_1.2.7.bb @@ -3,7 +3,7 @@ SECTION = "libs" DEPENDS = "apr expat gdbm" LICENSE = "Apache License, Version 2.0" -PR = "r1" +PR = "r2" # apache mirrors? SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.gz" @@ -21,5 +21,5 @@ do_configure() { } do_stage() { - oe_libinstall -a -so -C .libs libaprutil-1 ${STAGING_LIBDIR} + autotools_stage_all } -- cgit v1.2.3 From 23c147314ce4024329500380dbca62baf45452db Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 21 Dec 2006 22:36:53 +0000 Subject: subversion 1.4.0: it builds now --- packages/subversion/subversion_1.4.0.bb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/subversion/subversion_1.4.0.bb b/packages/subversion/subversion_1.4.0.bb index ac0b821d35..3c65d1d0a8 100644 --- a/packages/subversion/subversion_1.4.0.bb +++ b/packages/subversion/subversion_1.4.0.bb @@ -1,12 +1,10 @@ DESCRIPTION = "The Subversion (svn) client" SECTION = "console/network" -DEPENDS = "apr-util-0.9.12 neon" +DEPENDS = "apr-util neon" LICENSE = "Apache/BSD" HOMEPAGE = "http://subversion.tigris.org" PR = "r0" -DEFAULT_PREFERENCE = "-1" - SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \ file://disable-revision-install.patch;patch=1" @@ -15,8 +13,13 @@ EXTRA_OECONF = "--with-neon=${STAGING_DIR}/${BUILD_SYS} \ --without-swig --with-apr=${STAGING_BINDIR_CROSS} \ --with-apr-util=${STAGING_BINDIR_CROSS}" + inherit autotools +export LDFLAGS += " -L${STAGING_LIBDIR} " + do_configure() { + gnu-configize + libtoolize --force oe_runconf } -- cgit v1.2.3 From c00cd09f520da9d74176f4b9ab1b21db5e9067e1 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 22 Dec 2006 09:16:57 +0000 Subject: start removing task-bootstrap* as stated in removal.txt --- packages/obsolete/tasks/.mtn2git_empty | 0 .../obsolete/tasks/task-bootstrap-unionroot.bb | 34 ++++++++++++++++++++++ packages/obsolete/tasks/task-bootstrap.bb | 27 +++++++++++++++++ packages/obsolete/tasks/task-bootstrap.inc | 9 ++++++ packages/tasks/task-bootstrap-unionroot.bb | 34 ---------------------- packages/tasks/task-bootstrap.bb | 27 ----------------- packages/tasks/task-bootstrap.inc | 9 ------ removal.txt | 1 + 8 files changed, 71 insertions(+), 70 deletions(-) create mode 100644 packages/obsolete/tasks/.mtn2git_empty create mode 100644 packages/obsolete/tasks/task-bootstrap-unionroot.bb create mode 100644 packages/obsolete/tasks/task-bootstrap.bb create mode 100644 packages/obsolete/tasks/task-bootstrap.inc delete mode 100644 packages/tasks/task-bootstrap-unionroot.bb delete mode 100644 packages/tasks/task-bootstrap.bb delete mode 100644 packages/tasks/task-bootstrap.inc diff --git a/packages/obsolete/tasks/.mtn2git_empty b/packages/obsolete/tasks/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/obsolete/tasks/task-bootstrap-unionroot.bb b/packages/obsolete/tasks/task-bootstrap-unionroot.bb new file mode 100644 index 0000000000..e737e31608 --- /dev/null +++ b/packages/obsolete/tasks/task-bootstrap-unionroot.bb @@ -0,0 +1,34 @@ +DESCRIPTION = "Core packages required for a basic installation with unionroot" +PROVIDES = "task-bootstrap" +RPROVIDES = "task-bootstrap" +PR = "r2" +DEFAULT_PREFERENCE = "-1" + +# The BOOTSTRAP_EXTRA_ variables are often manipulated by the +# MACHINE .conf files, so adjust PACKAGE_ARCH accordingly. +PACKAGE_ARCH = "${MACHINE_ARCH}" + +ALLOW_EMPTY = "1" +PACKAGES = "${PN}" + +MODUTILS ?= "24 26" + +require task-bootstrap.inc + +HOTPLUG ?= "linux-hotplug" + +RDEPENDS = 'base-files base-passwd busybox \ + initscripts \ + netbase sysvinit sysvinit-pidof tinylogin \ + modutils-initscripts \ + ${HOTPLUG} \ + ${BOOTSTRAP_EXTRA_RDEPENDS} \ + ${@bootstrap_modutils_rdepends(d)} \ + unionfs-modules \ + unionfs-utils \ + unionroot \ + unionroot-utils' + +RRECOMMENDS = 'dropbear portmap \ + ${BOOTSTRAP_EXTRA_RRECOMMENDS}' +LICENSE = "MIT" diff --git a/packages/obsolete/tasks/task-bootstrap.bb b/packages/obsolete/tasks/task-bootstrap.bb new file mode 100644 index 0000000000..d84f331102 --- /dev/null +++ b/packages/obsolete/tasks/task-bootstrap.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "Core packages required for a basic installation" +PR = "r25" + +# The BOOTSTRAP_EXTRA_ variables are often manipulated by the +# MACHINE .conf files, so adjust PACKAGE_ARCH accordingly. +PACKAGE_ARCH = "${MACHINE_ARCH}" + +ALLOW_EMPTY = "1" +PACKAGES = "${PN}" + +MODUTILS ?= "24 26" + +require task-bootstrap.inc + +HOTPLUG ?= "linux-hotplug" + +RDEPENDS = 'base-files base-passwd busybox \ + initscripts \ + netbase sysvinit sysvinit-pidof tinylogin \ + modutils-initscripts fuser setserial\ + ${HOTPLUG} \ + ${BOOTSTRAP_EXTRA_RDEPENDS} \ + ${@bootstrap_modutils_rdepends(d)}' + +RRECOMMENDS = 'dropbear portmap \ + ${BOOTSTRAP_EXTRA_RRECOMMENDS}' +LICENSE = "MIT" diff --git a/packages/obsolete/tasks/task-bootstrap.inc b/packages/obsolete/tasks/task-bootstrap.inc new file mode 100644 index 0000000000..073da7055f --- /dev/null +++ b/packages/obsolete/tasks/task-bootstrap.inc @@ -0,0 +1,9 @@ +def bootstrap_modutils_rdepends(d): + import bb + m = bb.data.getVar('MODUTILS', d, 1) + r = [] + if '24' in m: + r.append('modutils-depmod') + if '26' in m: + r.append('module-init-tools-depmod') + return ' '.join(r) diff --git a/packages/tasks/task-bootstrap-unionroot.bb b/packages/tasks/task-bootstrap-unionroot.bb deleted file mode 100644 index e737e31608..0000000000 --- a/packages/tasks/task-bootstrap-unionroot.bb +++ /dev/null @@ -1,34 +0,0 @@ -DESCRIPTION = "Core packages required for a basic installation with unionroot" -PROVIDES = "task-bootstrap" -RPROVIDES = "task-bootstrap" -PR = "r2" -DEFAULT_PREFERENCE = "-1" - -# The BOOTSTRAP_EXTRA_ variables are often manipulated by the -# MACHINE .conf files, so adjust PACKAGE_ARCH accordingly. -PACKAGE_ARCH = "${MACHINE_ARCH}" - -ALLOW_EMPTY = "1" -PACKAGES = "${PN}" - -MODUTILS ?= "24 26" - -require task-bootstrap.inc - -HOTPLUG ?= "linux-hotplug" - -RDEPENDS = 'base-files base-passwd busybox \ - initscripts \ - netbase sysvinit sysvinit-pidof tinylogin \ - modutils-initscripts \ - ${HOTPLUG} \ - ${BOOTSTRAP_EXTRA_RDEPENDS} \ - ${@bootstrap_modutils_rdepends(d)} \ - unionfs-modules \ - unionfs-utils \ - unionroot \ - unionroot-utils' - -RRECOMMENDS = 'dropbear portmap \ - ${BOOTSTRAP_EXTRA_RRECOMMENDS}' -LICENSE = "MIT" diff --git a/packages/tasks/task-bootstrap.bb b/packages/tasks/task-bootstrap.bb deleted file mode 100644 index d84f331102..0000000000 --- a/packages/tasks/task-bootstrap.bb +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION = "Core packages required for a basic installation" -PR = "r25" - -# The BOOTSTRAP_EXTRA_ variables are often manipulated by the -# MACHINE .conf files, so adjust PACKAGE_ARCH accordingly. -PACKAGE_ARCH = "${MACHINE_ARCH}" - -ALLOW_EMPTY = "1" -PACKAGES = "${PN}" - -MODUTILS ?= "24 26" - -require task-bootstrap.inc - -HOTPLUG ?= "linux-hotplug" - -RDEPENDS = 'base-files base-passwd busybox \ - initscripts \ - netbase sysvinit sysvinit-pidof tinylogin \ - modutils-initscripts fuser setserial\ - ${HOTPLUG} \ - ${BOOTSTRAP_EXTRA_RDEPENDS} \ - ${@bootstrap_modutils_rdepends(d)}' - -RRECOMMENDS = 'dropbear portmap \ - ${BOOTSTRAP_EXTRA_RRECOMMENDS}' -LICENSE = "MIT" diff --git a/packages/tasks/task-bootstrap.inc b/packages/tasks/task-bootstrap.inc deleted file mode 100644 index 073da7055f..0000000000 --- a/packages/tasks/task-bootstrap.inc +++ /dev/null @@ -1,9 +0,0 @@ -def bootstrap_modutils_rdepends(d): - import bb - m = bb.data.getVar('MODUTILS', d, 1) - r = [] - if '24' in m: - r.append('modutils-depmod') - if '26' in m: - r.append('module-init-tools-depmod') - return ' '.join(r) diff --git a/removal.txt b/removal.txt index 7c09fded9f..70dc59278b 100644 --- a/removal.txt +++ b/removal.txt @@ -24,6 +24,7 @@ Removal Date: 2006-12-22 Maintainer: None Reason: Obsoleted by task-base Proposed by: Koen Kooi +Note: Moved to packages/obsolete/tasks on 2006-12-22 Package Name: gst* 0.8.x Removal Date: 2006-12-29 -- cgit v1.2.3 From c0c21a6d23cf70c053dbf39f85402e2d4ba21677 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 22 Dec 2006 09:26:00 +0000 Subject: local.conf.sample: update it a bit --- conf/local.conf.sample | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/conf/local.conf.sample b/conf/local.conf.sample index 52bd88a4e9..df00fbae37 100644 --- a/conf/local.conf.sample +++ b/conf/local.conf.sample @@ -55,8 +55,9 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" # TMPDIR = /usr/local/projects/oetmp # Uncomment this to specify a machine to build for. See the conf directory -# for machines currently known to OpenEmbedded. -# MACHINE = "collie" +# for machines currently known to OpenEmbedded. This will automatically take care +# of TARGET_ARCH +# MACHINE = "c7x0" # Use this to specify the target architecture. Note that this is only # needed when building for a machine not known to OpenEmbedded. Better use @@ -66,25 +67,26 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" # Use this to specify the target operating system. The default is "linux", # for a normal linux system with glibc. Set this to "linux-uclibc" if you want # to build a uclibc based system. +# Normally the DISTRO of your choosing will take care of this # TARGET_OS = "linux" # TARGET_OS = "linux-uclibc" # Uncomment this to select a distribution policy. See the conf directory # for distributions currently known to OpenEmbedded. -# Although they no longer contain version number in the (file-)name -# familiar-unstable and openzaurus-unstable are so called "versioned" -# distros, i.e. they explicitely select specific versions of various -# packages. +# Although it no longer contain version number in the (file-)name +# openzaurus-unstable is a so called "versioned" distro, i.e. they +# explicitely select specific versions of various packages. # Stay away from unversioned distros unless you really know what you are doing # DISTRO = "generic" -# So far, angstrom.conf and familiar.conf set ENABLE_BINARY_LOCALE_GENERATION +# So far, angstrom.conf sets ENABLE_BINARY_LOCALE_GENERATION # to generate binary locale packages at build time using qemu-native and # thereby guarantee i18n support on all devices. If your build breaks on # qemu-native consider disabling ENABLE_BINARY_LOCALE_GENERATION (note that # this breaks i18n on devices with less than 128MB RAM) or installing # a working third-party qemu (e.g. provided by your distribution) and -# adding qemu-native to ASSUME_PROVIDED +# adding qemu-native to ASSUME_PROVIDED. Caveat emptor, since third-party +# qemus lack patches needed to work with various OE targets. # ENABLE_BINARY_LOCALE_GENERATION = "0" # ASSUME_PROVIDED += "qemu-native" @@ -108,7 +110,8 @@ IMAGE_FSTYPES = "jffs2 tar" # BBDEBUG = "yes" # Uncomment these two if you want BitBake to build images useful for debugging. -# Note that INHIBIT_PACKAGE_STRIP needs a package format to be defined +# Note that INHIBIT_PACKAGE_STRIP needs a package format to be defined. +# Also note that OE now produces -dbg packages which contain debugging symbols. # DEBUG_BUILD = "1" # INHIBIT_PACKAGE_STRIP = "1" -- cgit v1.2.3