From 3ae862a58f39a37b10349cdf24e388196818099c Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Fri, 24 Aug 2007 15:13:43 +0000 Subject: xserver-common: Add 1.17 --- packages/xserver-common/xserver-common_1.17.bb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 packages/xserver-common/xserver-common_1.17.bb (limited to 'packages') diff --git a/packages/xserver-common/xserver-common_1.17.bb b/packages/xserver-common/xserver-common_1.17.bb new file mode 100644 index 0000000000..a30a37c893 --- /dev/null +++ b/packages/xserver-common/xserver-common_1.17.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Common X11 scripts and support files" +LICENSE = "GPL" +SECTION = "x11" +RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo" +PR = "r0" + +PACKAGE_ARCH = "all" + +# we are using a gpe-style Makefile +inherit gpe + +SRC_URI_append = " file://setDPI.sh " + +do_install_append() { + install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi" +} -- cgit v1.2.3 From dc19fc8f1bc26cdc4c2de3c66259c40aa7afd39a Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Sun, 26 Aug 2007 21:30:38 +0000 Subject: angstrom-minimal-image : Use mount from util-linux. Needed to moutn tmpfs. --- packages/images/angstrom-minimal-image.bb | 1 + 1 file changed, 1 insertion(+) (limited to 'packages') diff --git a/packages/images/angstrom-minimal-image.bb b/packages/images/angstrom-minimal-image.bb index 83d814a79a..e10954838c 100644 --- a/packages/images/angstrom-minimal-image.bb +++ b/packages/images/angstrom-minimal-image.bb @@ -8,6 +8,7 @@ DISTRO_SSH_DAEMON ?= "dropbear" IMAGE_LINGUAS = " " RDEPENDS = "task-boot \ + util-linux-mount util-linux-umount \ ${DISTRO_SSH_DAEMON} \ angstrom-version \ " -- cgit v1.2.3 From f12bac9343c3825c4106c61ac57f30c3f539616c Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Mon, 27 Aug 2007 03:46:38 +0000 Subject: ixp4xx-kernel: Enable support for IXDPG425 boards in the defconfig --- packages/linux/ixp4xx-kernel/2.6.21/defconfig | 2 +- packages/linux/ixp4xx-kernel/2.6.22/defconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/linux/ixp4xx-kernel/2.6.21/defconfig b/packages/linux/ixp4xx-kernel/2.6.21/defconfig index 0fbb58a561..cdaa9f58ef 100644 --- a/packages/linux/ixp4xx-kernel/2.6.21/defconfig +++ b/packages/linux/ixp4xx-kernel/2.6.21/defconfig @@ -148,7 +148,7 @@ CONFIG_MACH_AVILA=y CONFIG_MACH_LOFT=y # CONFIG_ARCH_ADI_COYOTE is not set CONFIG_ARCH_IXDP425=y -# CONFIG_MACH_IXDPG425 is not set +CONFIG_MACH_IXDPG425=y # CONFIG_MACH_IXDP465 is not set CONFIG_ARCH_IXCDP1100=y # CONFIG_ARCH_PRPMC1100 is not set diff --git a/packages/linux/ixp4xx-kernel/2.6.22/defconfig b/packages/linux/ixp4xx-kernel/2.6.22/defconfig index 95b301932f..6eaf4df545 100644 --- a/packages/linux/ixp4xx-kernel/2.6.22/defconfig +++ b/packages/linux/ixp4xx-kernel/2.6.22/defconfig @@ -159,7 +159,7 @@ CONFIG_MACH_AVILA=y CONFIG_MACH_LOFT=y # CONFIG_ARCH_ADI_COYOTE is not set CONFIG_ARCH_IXDP425=y -# CONFIG_MACH_IXDPG425 is not set +CONFIG_MACH_IXDPG425=y # CONFIG_MACH_IXDP465 is not set # CONFIG_MACH_KIXRP435 is not set CONFIG_ARCH_IXCDP1100=y -- cgit v1.2.3 From d3d48ef62eb4697182308dedd4ab76e4293cf6be Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Mon, 27 Aug 2007 09:55:41 +0000 Subject: vochistory: Add 0.1 --- packages/gpephone/vochistory_0.1.bb | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 packages/gpephone/vochistory_0.1.bb (limited to 'packages') diff --git a/packages/gpephone/vochistory_0.1.bb b/packages/gpephone/vochistory_0.1.bb new file mode 100644 index 0000000000..d72bbcc3cd --- /dev/null +++ b/packages/gpephone/vochistory_0.1.bb @@ -0,0 +1,12 @@ +LICENSE = "LiPS" +DESCRIPTION = "Voice call event history" +SECTION = "gpe" +PRIORITY = "optional" +PR = "r0" + +DEPENDS = "gtk+ dbus-glib libgpewidget libgpephone libiac libchenabler" + +inherit gpephone autotools + +SRC_URI = "${GPEPHONE_MIRROR}/vochistory-${PV}/callhistory-${PV}.tar.bz2" +S = "${WORKDIR}/callhistory-${PV}" \ No newline at end of file -- cgit v1.2.3 From 158d65a387b606df65e444b008d90efd4dd5a583 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Mon, 27 Aug 2007 09:56:47 +0000 Subject: gpe-session-scripts-phone: Drop some environment crap. --- packages/gpephone/gpe-session-scripts-phone/phonesession | 1 - packages/gpephone/gpe-session-scripts-phone_0.67.bb | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/gpephone/gpe-session-scripts-phone/phonesession b/packages/gpephone/gpe-session-scripts-phone/phonesession index 2dacc4c4c9..ee187e2fb0 100755 --- a/packages/gpephone/gpe-session-scripts-phone/phonesession +++ b/packages/gpephone/gpe-session-scripts-phone/phonesession @@ -24,7 +24,6 @@ export SMS_GRAPHIC_PATH=$APP_PATH/share/graphic export SMS_RING_TONE_PATH=$APP_PATH/share/chocolate.mp3 # For E-mail -export EMAIL_GRAPHIC_PATH=$APP_PATH/share/email-graphic export TINYMAIL_CACHE_DIR=$APP_PATH/share/tinymail.cache # For Calendar diff --git a/packages/gpephone/gpe-session-scripts-phone_0.67.bb b/packages/gpephone/gpe-session-scripts-phone_0.67.bb index 730a549aef..4cedeaa7f8 100644 --- a/packages/gpephone/gpe-session-scripts-phone_0.67.bb +++ b/packages/gpephone/gpe-session-scripts-phone_0.67.bb @@ -14,7 +14,7 @@ SRC_URI = "${GPE_MIRROR}/gpe-session-scripts-${PV}.tar.gz \ file://disable-composite.xsettings \ file://standard-apps.patch;patch=1" -PR = "r7" +PR = "r8" S = "${WORKDIR}/gpe-session-scripts-${PV}" -- cgit v1.2.3 From 7dff4ff5b72131ce796190d0d52abd5d7da3e76c Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Mon, 27 Aug 2007 09:57:57 +0000 Subject: libabenabler2: Add version 1.0 --- packages/gpephone/libabenabler2_1.0.bb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 packages/gpephone/libabenabler2_1.0.bb (limited to 'packages') diff --git a/packages/gpephone/libabenabler2_1.0.bb b/packages/gpephone/libabenabler2_1.0.bb new file mode 100644 index 0000000000..9277d9359a --- /dev/null +++ b/packages/gpephone/libabenabler2_1.0.bb @@ -0,0 +1,15 @@ +LICENSE = "LiPS" +DESCRIPTION = "LiPS address book library." +SECTION = "gpe/libs" +PRIORITY = "optional" +DEPENDS = "glib-2.0 librecord2 gconf sqlite3" +PR = "r0" + +GPE_TARBALL_SUFFIX = "bz2" +inherit gpephone pkgconfig autotools + +LDFLAGS += " -L${STAGING_LIBDIR}" + +do_stage () { + autotools_stage_all +} -- cgit v1.2.3 From d736249b3adddd84d6f07c75d1df1cfbe5283247 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Mon, 27 Aug 2007 09:59:00 +0000 Subject: ptim-engine: Package additional files --- packages/gpephone/ptim-engine_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/gpephone/ptim-engine_svn.bb b/packages/gpephone/ptim-engine_svn.bb index a2a38a0e2e..37c99f7dd1 100644 --- a/packages/gpephone/ptim-engine_svn.bb +++ b/packages/gpephone/ptim-engine_svn.bb @@ -14,7 +14,7 @@ SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/ptim;module=im S = "${WORKDIR}/imengine" -FILES_${PN} += " ${libdir}/gtk-2.0/*/immodules/ptim/engine/*.so " +FILES_${PN} += " ${libdir}/gtk-2.0/*/immodules/ptim/engine/*.so ${libdir}/gtk-2.0/*/immodules/ptim/pydatabase/*" FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/immodules/ptim/engine/.debug/*.so" FILES_${PN}-dev += "${libdir}/gtk-2.0/*/immodules/ptim/engine/*.la" -- cgit v1.2.3 From 04f1fbc5efc6be1f54ca52efa708701a1ff76c60 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Mon, 27 Aug 2007 10:01:59 +0000 Subject: task-gpephone: Add vochistory --- packages/tasks/task-gpephone.bb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'packages') diff --git a/packages/tasks/task-gpephone.bb b/packages/tasks/task-gpephone.bb index e0298ae8d7..27cb26174b 100644 --- a/packages/tasks/task-gpephone.bb +++ b/packages/tasks/task-gpephone.bb @@ -29,6 +29,7 @@ RDEPENDS_gpephone-task-base = "\ phoneserver \ soundserver \ voicecall \ + vochistory \ sms \ audioplayer \ videoplayer \ @@ -87,4 +88,5 @@ RDEPENDS_gpephone-task-apps = "\ gpe-windowlist" RDEPENDS_gpephone-task-connectivity = "\ + email \ " -- cgit v1.2.3 From 242abf96b40376f72d24380f2b1e6b87d97e5492 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Mon, 27 Aug 2007 10:30:31 +0000 Subject: fbreader: Get rid of iconv crap --- packages/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch | 2 +- packages/fbreader/fbreader_0.8.2a.bb | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'packages') diff --git a/packages/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch b/packages/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch index ecb60a2108..858a713125 100644 --- a/packages/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch +++ b/packages/fbreader/fbreader-0.8.2a/fbreader-0.8.2a_buildsys_oe.patch @@ -18,7 +18,7 @@ diff -Nur fbreader-0.8.2a.orig/makefiles/arch/openzaurus.mk fbreader-0.8.2a/make + UILIBS = -lqt-mt else - UILIBS = -lgpewidget -lgtk-x11-2.0 -lgdk-x11-2.0 -lgdk_pixbuf-2.0 -+ UILIBS = $(shell pkg-config --libs gtk+-2.0) -lgpewidget -liconv ++ UILIBS = $(shell pkg-config --libs gtk+-2.0) -lgpewidget endif -CFLAGS = -pipe -DOPIE_NO_DEBUG -DQT_NO_DEBUG -DQWS -fno-exceptions -fno-rtti -march=armv4 -mtune=xscale --param large-function-growth=2000 --param inline-unit-growth=200 -Wall -Wno-ctor-dtor-privacy -W -Winline diff --git a/packages/fbreader/fbreader_0.8.2a.bb b/packages/fbreader/fbreader_0.8.2a.bb index c932d21bdc..ca25bdc620 100644 --- a/packages/fbreader/fbreader_0.8.2a.bb +++ b/packages/fbreader/fbreader_0.8.2a.bb @@ -40,8 +40,6 @@ FILES_${PN} += "${datadir}/FBReader ${datadir}/zlibrary" CFLAGS_append = " RESOLUTION=${READER_RESOLUTION} INSTALLDIR=/usr" EXTRA_OEMAKE = "CC='${CXX}' LD='${CXX}' OE_CFLAGS='${CXXFLAGS}' INCPATH='${STAGING_INCDIR}' LIBPATH='${STAGING_LIBDIR}'" -LDFLAGS_append = " -liconv" - inherit pkgconfig do_configure() { -- cgit v1.2.3 From d19f966b037acf56964c24e527db5e3dad2f5fae Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 27 Aug 2007 11:06:54 +0000 Subject: gcc 4.2.1: add extra patches for uclibc build * uclibc still dislike 4.2.1, but it fails in a different place now --- packages/gcc/gcc-4.2.1/100-uclibc-conf.patch.lock | 0 .../gcc/gcc-4.2.1/103-uclibc-conf-noupstream.patch | 11 ++ .../gcc/gcc-4.2.1/200-uclibc-locale.patch.lock | 0 .../gcc/gcc-4.2.1/203-uclibc-locale-no__x.patch | 213 +++++++++++++++++++++ .../gcc/gcc-4.2.1/300-libstdc++-pic.patch.lock | 0 .../gcc-4.2.1/301-missing-execinfo_h.patch.lock | 0 packages/gcc/gcc-4.2.1/302-c99-snprintf.patch.lock | 0 .../gcc-4.2.1/303-c99-complex-ugly-hack.patch.lock | 0 packages/gcc/gcc-4.2.1/304-index_macro.patch.lock | 0 .../gcc-4.2.1/305-libmudflap-susv3-legacy.patch | 49 +++++ .../gcc/gcc-4.2.1/306-libstdc++-namespace.patch | 36 ++++ packages/gcc/gcc-4.2.1/307-locale_facets.patch | 26 +++ .../gcc-4.2.1/402-libbackend_dep_gcov-iov.h.patch | 13 ++ .../602-sdk-libstdc++-includes.patch.lock | 0 packages/gcc/gcc-4.2.1/740-sh-pr24836.patch.lock | 0 .../gcc/gcc-4.2.1/800-arm-bigendian.patch.lock | 0 .../904-flatten-switch-stmt-00.patch.lock | 0 packages/gcc/gcc-4.2.1/arm-nolibfloat.patch.lock | 0 packages/gcc/gcc-4.2.1/arm-softfloat.patch.lock | 0 packages/gcc/gcc-4.2.1/arm-thumb-cache.patch.lock | 0 packages/gcc/gcc-4.2.1/arm-thumb.patch.lock | 0 packages/gcc/gcc-4.2.1/cache-amnesia.patch.lock | 0 .../fix-ICE-in-arm_unwind_emit_set.diff.lock | 0 .../gcc/gcc-4.2.1/gcc41-configure.in.patch.lock | 0 packages/gcc/gcc-4.2.1/ldflags.patch.lock | 0 packages/gcc/gcc-4.2.1/unbreak-armv4t.patch.lock | 0 .../gcc-4.2.1/zecke-no-host-includes.patch.lock | 0 packages/gcc/gcc-4.2.1/zecke-xgcc-cpp.patch.lock | 0 packages/gcc/gcc-cross_4.2.1.bb | 2 +- packages/gcc/gcc_4.2.1.bb | 12 +- 30 files changed, 358 insertions(+), 4 deletions(-) create mode 100644 packages/gcc/gcc-4.2.1/100-uclibc-conf.patch.lock create mode 100644 packages/gcc/gcc-4.2.1/103-uclibc-conf-noupstream.patch create mode 100644 packages/gcc/gcc-4.2.1/200-uclibc-locale.patch.lock create mode 100644 packages/gcc/gcc-4.2.1/203-uclibc-locale-no__x.patch create mode 100644 packages/gcc/gcc-4.2.1/300-libstdc++-pic.patch.lock create mode 100644 packages/gcc/gcc-4.2.1/301-missing-execinfo_h.patch.lock create mode 100644 packages/gcc/gcc-4.2.1/302-c99-snprintf.patch.lock create mode 100644 packages/gcc/gcc-4.2.1/303-c99-complex-ugly-hack.patch.lock create mode 100644 packages/gcc/gcc-4.2.1/304-index_macro.patch.lock create mode 100644 packages/gcc/gcc-4.2.1/305-libmudflap-susv3-legacy.patch create mode 100644 packages/gcc/gcc-4.2.1/306-libstdc++-namespace.patch create mode 100644 packages/gcc/gcc-4.2.1/307-locale_facets.patch create mode 100644 packages/gcc/gcc-4.2.1/402-libbackend_dep_gcov-iov.h.patch create mode 100644 packages/gcc/gcc-4.2.1/602-sdk-libstdc++-includes.patch.lock create mode 100644 packages/gcc/gcc-4.2.1/740-sh-pr24836.patch.lock create mode 100644 packages/gcc/gcc-4.2.1/800-arm-bigendian.patch.lock create mode 100644 packages/gcc/gcc-4.2.1/904-flatten-switch-stmt-00.patch.lock create mode 100644 packages/gcc/gcc-4.2.1/arm-nolibfloat.patch.lock create mode 100644 packages/gcc/gcc-4.2.1/arm-softfloat.patch.lock create mode 100644 packages/gcc/gcc-4.2.1/arm-thumb-cache.patch.lock create mode 100644 packages/gcc/gcc-4.2.1/arm-thumb.patch.lock create mode 100644 packages/gcc/gcc-4.2.1/cache-amnesia.patch.lock create mode 100644 packages/gcc/gcc-4.2.1/fix-ICE-in-arm_unwind_emit_set.diff.lock create mode 100644 packages/gcc/gcc-4.2.1/gcc41-configure.in.patch.lock create mode 100644 packages/gcc/gcc-4.2.1/ldflags.patch.lock create mode 100644 packages/gcc/gcc-4.2.1/unbreak-armv4t.patch.lock create mode 100644 packages/gcc/gcc-4.2.1/zecke-no-host-includes.patch.lock create mode 100644 packages/gcc/gcc-4.2.1/zecke-xgcc-cpp.patch.lock (limited to 'packages') diff --git a/packages/gcc/gcc-4.2.1/100-uclibc-conf.patch.lock b/packages/gcc/gcc-4.2.1/100-uclibc-conf.patch.lock new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gcc/gcc-4.2.1/103-uclibc-conf-noupstream.patch b/packages/gcc/gcc-4.2.1/103-uclibc-conf-noupstream.patch new file mode 100644 index 0000000000..09c9bbecfb --- /dev/null +++ b/packages/gcc/gcc-4.2.1/103-uclibc-conf-noupstream.patch @@ -0,0 +1,11 @@ +--- gcc/gcc/config.gcc.uclibc100-sh~ 2006-03-06 20:46:56 +0100 ++++ gcc/gcc/config.gcc 2006-03-10 15:02:41 +0100 +@@ -1905,7 +1905,7 @@ + ;; + sh-*-elf* | sh[12346l]*-*-elf* | sh*-*-kaos* | \ + sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \ +- sh-*-linux* | sh[346lbe]*-*-linux* | \ ++ sh*-*-linux* | sh[346lbe]*-*-linux* | \ + sh-*-netbsdelf* | shl*-*-netbsdelf* | sh5-*-netbsd* | sh5l*-*-netbsd* | \ + sh64-*-netbsd* | sh64l*-*-netbsd*) + tmake_file="${tmake_file} sh/t-sh sh/t-elf" diff --git a/packages/gcc/gcc-4.2.1/200-uclibc-locale.patch.lock b/packages/gcc/gcc-4.2.1/200-uclibc-locale.patch.lock new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gcc/gcc-4.2.1/203-uclibc-locale-no__x.patch b/packages/gcc/gcc-4.2.1/203-uclibc-locale-no__x.patch new file mode 100644 index 0000000000..6ba47003b3 --- /dev/null +++ b/packages/gcc/gcc-4.2.1/203-uclibc-locale-no__x.patch @@ -0,0 +1,213 @@ +--- gcc/libstdc++-v3/config/locale/uclibc/c++locale_internal.h.uclibc200no__x~ 2006-03-10 15:06:17 +0100 ++++ gcc/libstdc++-v3/config/locale/uclibc/c++locale_internal.h 2006-03-10 15:32:37 +0100 +@@ -60,4 +60,49 @@ + extern "C" __typeof(wctype_l) __wctype_l; + #endif + ++# define __nl_langinfo_l nl_langinfo_l ++# define __strcoll_l strcoll_l ++# define __strftime_l strftime_l ++# define __strtod_l strtod_l ++# define __strtof_l strtof_l ++# define __strtold_l strtold_l ++# define __strxfrm_l strxfrm_l ++# define __newlocale newlocale ++# define __freelocale freelocale ++# define __duplocale duplocale ++# define __uselocale uselocale ++ ++# ifdef _GLIBCXX_USE_WCHAR_T ++# define __iswctype_l iswctype_l ++# define __towlower_l towlower_l ++# define __towupper_l towupper_l ++# define __wcscoll_l wcscoll_l ++# define __wcsftime_l wcsftime_l ++# define __wcsxfrm_l wcsxfrm_l ++# define __wctype_l wctype_l ++# endif ++ ++#else ++# define __nl_langinfo_l(N, L) nl_langinfo((N)) ++# define __strcoll_l(S1, S2, L) strcoll((S1), (S2)) ++# define __strtod_l(S, E, L) strtod((S), (E)) ++# define __strtof_l(S, E, L) strtof((S), (E)) ++# define __strtold_l(S, E, L) strtold((S), (E)) ++# define __strxfrm_l(S1, S2, N, L) strxfrm((S1), (S2), (N)) ++# warning should dummy __newlocale check for C|POSIX ? ++# define __newlocale(a, b, c) NULL ++# define __freelocale(a) ((void)0) ++# define __duplocale(a) __c_locale() ++//# define __uselocale ? ++// ++# ifdef _GLIBCXX_USE_WCHAR_T ++# define __iswctype_l(C, M, L) iswctype((C), (M)) ++# define __towlower_l(C, L) towlower((C)) ++# define __towupper_l(C, L) towupper((C)) ++# define __wcscoll_l(S1, S2, L) wcscoll((S1), (S2)) ++//# define __wcsftime_l(S, M, F, T, L) wcsftime((S), (M), (F), (T)) ++# define __wcsxfrm_l(S1, S2, N, L) wcsxfrm((S1), (S2), (N)) ++# define __wctype_l(S, L) wctype((S)) ++# endif ++ + #endif // GLIBC 2.3 and later +--- gcc/libstdc++-v3/config/locale/uclibc/c_locale.cc.uclibc200no__x~ 2006-03-10 15:06:17 +0100 ++++ gcc/libstdc++-v3/config/locale/uclibc/c_locale.cc 2006-03-10 15:32:37 +0100 +@@ -39,20 +39,6 @@ + #include + #include + +-#ifndef __UCLIBC_HAS_XLOCALE__ +-#define __strtol_l(S, E, B, L) strtol((S), (E), (B)) +-#define __strtoul_l(S, E, B, L) strtoul((S), (E), (B)) +-#define __strtoll_l(S, E, B, L) strtoll((S), (E), (B)) +-#define __strtoull_l(S, E, B, L) strtoull((S), (E), (B)) +-#define __strtof_l(S, E, L) strtof((S), (E)) +-#define __strtod_l(S, E, L) strtod((S), (E)) +-#define __strtold_l(S, E, L) strtold((S), (E)) +-#warning should dummy __newlocale check for C|POSIX ? +-#define __newlocale(a, b, c) NULL +-#define __freelocale(a) ((void)0) +-#define __duplocale(a) __c_locale() +-#endif +- + namespace std + { + template<> +--- gcc/libstdc++-v3/config/locale/uclibc/collate_members.cc.uclibc200no__x~ 2006-03-10 15:06:17 +0100 ++++ gcc/libstdc++-v3/config/locale/uclibc/collate_members.cc 2006-03-10 15:32:37 +0100 +@@ -36,13 +36,6 @@ + #include + #include + +-#ifndef __UCLIBC_HAS_XLOCALE__ +-#define __strcoll_l(S1, S2, L) strcoll((S1), (S2)) +-#define __strxfrm_l(S1, S2, N, L) strxfrm((S1), (S2), (N)) +-#define __wcscoll_l(S1, S2, L) wcscoll((S1), (S2)) +-#define __wcsxfrm_l(S1, S2, N, L) wcsxfrm((S1), (S2), (N)) +-#endif +- + namespace std + { + // These are basically extensions to char_traits, and perhaps should +--- gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc.uclibc200no__x~ 2006-03-10 15:06:17 +0100 ++++ gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2006-03-10 15:32:37 +0100 +@@ -43,10 +43,6 @@ + #warning tailor for stub locale support + #endif + +-#ifndef __UCLIBC_HAS_XLOCALE__ +-#define __nl_langinfo_l(N, L) nl_langinfo((N)) +-#endif +- + namespace std + { + // Construct and return valid pattern consisting of some combination of: +--- gcc/libstdc++-v3/config/locale/uclibc/numeric_members.cc.uclibc200no__x~ 2006-03-10 15:06:17 +0100 ++++ gcc/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2006-03-10 15:32:37 +0100 +@@ -41,9 +41,6 @@ + #ifdef __UCLIBC_MJN3_ONLY__ + #warning tailor for stub locale support + #endif +-#ifndef __UCLIBC_HAS_XLOCALE__ +-#define __nl_langinfo_l(N, L) nl_langinfo((N)) +-#endif + + namespace std + { +--- gcc/libstdc++-v3/config/locale/uclibc/time_members.cc.uclibc200no__x~ 2006-03-10 15:06:17 +0100 ++++ gcc/libstdc++-v3/config/locale/uclibc/time_members.cc 2006-03-10 15:32:37 +0100 +@@ -40,9 +40,6 @@ + #ifdef __UCLIBC_MJN3_ONLY__ + #warning tailor for stub locale support + #endif +-#ifndef __UCLIBC_HAS_XLOCALE__ +-#define __nl_langinfo_l(N, L) nl_langinfo((N)) +-#endif + + namespace std + { +--- gcc/libstdc++-v3/config/locale/uclibc/ctype_members.cc.uclibc200no__x~ 2006-03-10 15:06:17 +0100 ++++ gcc/libstdc++-v3/config/locale/uclibc/ctype_members.cc 2006-03-10 15:32:37 +0100 +@@ -38,13 +38,6 @@ + #undef _LIBC + #include + +-#ifndef __UCLIBC_HAS_XLOCALE__ +-#define __wctype_l(S, L) wctype((S)) +-#define __towupper_l(C, L) towupper((C)) +-#define __towlower_l(C, L) towlower((C)) +-#define __iswctype_l(C, M, L) iswctype((C), (M)) +-#endif +- + namespace std + { + // NB: The other ctype specializations are in src/locale.cc and +--- gcc/libstdc++-v3/config/locale/uclibc/messages_members.cc.uclibc200no__x~ 2006-03-10 15:06:17 +0100 ++++ gcc/libstdc++-v3/config/locale/uclibc/messages_members.cc 2006-03-10 15:32:37 +0100 +@@ -39,13 +39,10 @@ + #ifdef __UCLIBC_MJN3_ONLY__ + #warning fix gettext stuff + #endif +-#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__ +-extern "C" char *__dcgettext(const char *domainname, +- const char *msgid, int category); + #undef gettext +-#define gettext(msgid) __dcgettext(NULL, msgid, LC_MESSAGES) ++#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__ ++#define gettext(msgid) dcgettext(NULL, msgid, LC_MESSAGES) + #else +-#undef gettext + #define gettext(msgid) (msgid) + #endif + +--- gcc/libstdc++-v3/config/locale/uclibc/messages_members.h.uclibc200no__x~ 2006-03-10 15:06:17 +0100 ++++ gcc/libstdc++-v3/config/locale/uclibc/messages_members.h 2006-03-10 15:32:37 +0100 +@@ -36,15 +36,11 @@ + #ifdef __UCLIBC_MJN3_ONLY__ + #warning fix prototypes for *textdomain funcs + #endif +-#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__ +-extern "C" char *__textdomain(const char *domainname); +-extern "C" char *__bindtextdomain(const char *domainname, +- const char *dirname); +-#else +-#undef __textdomain +-#undef __bindtextdomain +-#define __textdomain(D) ((void)0) +-#define __bindtextdomain(D,P) ((void)0) ++#ifndef __UCLIBC_HAS_GETTEXT_AWARENESS__ ++#undef textdomain ++#undef bindtextdomain ++#define textdomain(D) ((void)0) ++#define bindtextdomain(D,P) ((void)0) + #endif + + // Non-virtual member functions. +@@ -70,7 +66,7 @@ + messages<_CharT>::open(const basic_string& __s, const locale& __loc, + const char* __dir) const + { +- __bindtextdomain(__s.c_str(), __dir); ++ bindtextdomain(__s.c_str(), __dir); + return this->do_open(__s, __loc); + } + +@@ -90,7 +86,7 @@ + { + // No error checking is done, assume the catalog exists and can + // be used. +- __textdomain(__s.c_str()); ++ textdomain(__s.c_str()); + return 0; + } + +--- gcc/libstdc++-v3/config/locale/uclibc/c_locale.h.uclibc200no__x~ 2006-03-10 15:06:17 +0100 ++++ gcc/libstdc++-v3/config/locale/uclibc/c_locale.h 2006-03-10 15:32:37 +0100 +@@ -68,6 +68,7 @@ + { + extern "C" __typeof(uselocale) __uselocale; + } ++#define __uselocale uselocale + #endif + + namespace std diff --git a/packages/gcc/gcc-4.2.1/300-libstdc++-pic.patch.lock b/packages/gcc/gcc-4.2.1/300-libstdc++-pic.patch.lock new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gcc/gcc-4.2.1/301-missing-execinfo_h.patch.lock b/packages/gcc/gcc-4.2.1/301-missing-execinfo_h.patch.lock new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gcc/gcc-4.2.1/302-c99-snprintf.patch.lock b/packages/gcc/gcc-4.2.1/302-c99-snprintf.patch.lock new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gcc/gcc-4.2.1/303-c99-complex-ugly-hack.patch.lock b/packages/gcc/gcc-4.2.1/303-c99-complex-ugly-hack.patch.lock new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gcc/gcc-4.2.1/304-index_macro.patch.lock b/packages/gcc/gcc-4.2.1/304-index_macro.patch.lock new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gcc/gcc-4.2.1/305-libmudflap-susv3-legacy.patch b/packages/gcc/gcc-4.2.1/305-libmudflap-susv3-legacy.patch new file mode 100644 index 0000000000..374b1f8659 --- /dev/null +++ b/packages/gcc/gcc-4.2.1/305-libmudflap-susv3-legacy.patch @@ -0,0 +1,49 @@ +Index: gcc-4.2/libmudflap/mf-hooks2.c +=================================================================== +--- gcc-4.2/libmudflap/mf-hooks2.c (revision 119834) ++++ gcc-4.2/libmudflap/mf-hooks2.c (working copy) +@@ -427,7 +427,7 @@ + { + TRACE ("%s\n", __PRETTY_FUNCTION__); + MF_VALIDATE_EXTENT(s, n, __MF_CHECK_WRITE, "bzero region"); +- bzero (s, n); ++ memset (s, 0, n); + } + + +@@ -437,7 +437,7 @@ + TRACE ("%s\n", __PRETTY_FUNCTION__); + MF_VALIDATE_EXTENT(src, n, __MF_CHECK_READ, "bcopy src"); + MF_VALIDATE_EXTENT(dest, n, __MF_CHECK_WRITE, "bcopy dest"); +- bcopy (src, dest, n); ++ memmove (dest, src, n); + } + + +@@ -447,7 +447,7 @@ + TRACE ("%s\n", __PRETTY_FUNCTION__); + MF_VALIDATE_EXTENT(s1, n, __MF_CHECK_READ, "bcmp 1st arg"); + MF_VALIDATE_EXTENT(s2, n, __MF_CHECK_READ, "bcmp 2nd arg"); +- return bcmp (s1, s2, n); ++ return n == 0 ? 0 : memcmp (s1, s2, n); + } + + +@@ -456,7 +456,7 @@ + size_t n = strlen (s); + TRACE ("%s\n", __PRETTY_FUNCTION__); + MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "index region"); +- return index (s, c); ++ return strchr (s, c); + } + + +@@ -465,7 +465,7 @@ + size_t n = strlen (s); + TRACE ("%s\n", __PRETTY_FUNCTION__); + MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "rindex region"); +- return rindex (s, c); ++ return strrchr (s, c); + } + + /* XXX: stpcpy, memccpy */ diff --git a/packages/gcc/gcc-4.2.1/306-libstdc++-namespace.patch b/packages/gcc/gcc-4.2.1/306-libstdc++-namespace.patch new file mode 100644 index 0000000000..69587ca63a --- /dev/null +++ b/packages/gcc/gcc-4.2.1/306-libstdc++-namespace.patch @@ -0,0 +1,36 @@ +diff -rup gcc-4.2.orig/libstdc++-v3/config/locale/uclibc/messages_members.h gcc-4.2/libstdc++-v3/config/locale/uclibc/messages_members.h +--- gcc-4.2.orig/libstdc++-v3/config/locale/uclibc/messages_members.h 2006-12-22 13:06:56.000000000 +0100 ++++ gcc-4.2/libstdc++-v3/config/locale/uclibc/messages_members.h 2006-12-22 15:23:41.000000000 +0100 +@@ -32,7 +32,8 @@ + // + + // Written by Benjamin Kosnik +- ++namespace std ++{ + #ifdef __UCLIBC_MJN3_ONLY__ + #warning fix prototypes for *textdomain funcs + #endif +@@ -115,3 +116,4 @@ + this->_S_create_c_locale(this->_M_c_locale_messages, __s); + } + } ++} +diff -rup gcc-4.2.orig/libstdc++-v3/config/locale/uclibc/time_members.h gcc-4.2/libstdc++-v3/config/locale/uclibc/time_members.h +--- gcc-4.2.orig/libstdc++-v3/config/locale/uclibc/time_members.h 2006-12-22 13:06:56.000000000 +0100 ++++ gcc-4.2/libstdc++-v3/config/locale/uclibc/time_members.h 2006-12-22 15:20:31.000000000 +0100 +@@ -33,7 +33,8 @@ + // + + // Written by Benjamin Kosnik +- ++namespace std ++{ + template + __timepunct<_CharT>::__timepunct(size_t __refs) + : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL), +@@ -74,3 +75,4 @@ + delete _M_data; + _S_destroy_c_locale(_M_c_locale_timepunct); + } ++} diff --git a/packages/gcc/gcc-4.2.1/307-locale_facets.patch b/packages/gcc/gcc-4.2.1/307-locale_facets.patch new file mode 100644 index 0000000000..412f8657dc --- /dev/null +++ b/packages/gcc/gcc-4.2.1/307-locale_facets.patch @@ -0,0 +1,26 @@ +This patch fixes a bug into ostream::operator<<(double) due to the wrong size +passed into the __convert_from_v method. The wrong size is then passed to +std::snprintf function, that, on uClibc, doens't handle sized 0 buffer. + +Signed-off-by: Carmelo Amoroso + +--- gcc-4.2.1/libstdc++-v3/include/bits/locale_facets.tcc 2006-10-17 18:43:47.000000000 +0200 ++++ gcc-4.2.1-st/libstdc++-v3/include/bits/locale_facets.tcc 2007-08-22 18:54:23.000000000 +0200 +@@ -1143,7 +1143,7 @@ _GLIBCXX_BEGIN_LDBL_NAMESPACE + const int __cs_size = __fixed ? __max_exp + __prec + 4 + : __max_digits * 2 + __prec; + char* __cs = static_cast(__builtin_alloca(__cs_size)); +- __len = std::__convert_from_v(_S_get_c_locale(), __cs, 0, __fbuf, ++ __len = std::__convert_from_v(_S_get_c_locale(), __cs, __cs_size, __fbuf, + __prec, __v); + #endif + +@@ -1777,7 +1777,7 @@ _GLIBCXX_BEGIN_LDBL_NAMESPACE + // max_exponent10 + 1 for the integer part, + 2 for sign and '\0'. + const int __cs_size = numeric_limits::max_exponent10 + 3; + char* __cs = static_cast(__builtin_alloca(__cs_size)); +- int __len = std::__convert_from_v(_S_get_c_locale(), __cs, 0, "%.*Lf", ++ int __len = std::__convert_from_v(_S_get_c_locale(), __cs, __cs_size, "%.*Lf", + 0, __units); + #endif + string_type __digits(__len, char_type()); diff --git a/packages/gcc/gcc-4.2.1/402-libbackend_dep_gcov-iov.h.patch b/packages/gcc/gcc-4.2.1/402-libbackend_dep_gcov-iov.h.patch new file mode 100644 index 0000000000..0bf115c45d --- /dev/null +++ b/packages/gcc/gcc-4.2.1/402-libbackend_dep_gcov-iov.h.patch @@ -0,0 +1,13 @@ +Index: gcc-4.2/gcc/Makefile.in +=================================================================== +--- gcc-4.2/gcc/Makefile.in (revision 121758) ++++ gcc-4.2/gcc/Makefile.in (working copy) +@@ -2658,7 +2658,7 @@ mips-tdump.o : mips-tdump.c $(CONFIG_H) + # FIXME: writing proper dependencies for this is a *LOT* of work. + libbackend.o : $(OBJS-common:.o=.c) $(out_file) \ + insn-config.h insn-flags.h insn-codes.h insn-constants.h \ +- insn-attr.h $(DATESTAMP) $(BASEVER) $(DEVPHASE) ++ insn-attr.h $(DATESTAMP) $(BASEVER) $(DEVPHASE) gcov-iov.h + $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) \ + -DTARGET_NAME=\"$(target_noncanonical)\" \ + -DLOCALEDIR=\"$(localedir)\" \ diff --git a/packages/gcc/gcc-4.2.1/602-sdk-libstdc++-includes.patch.lock b/packages/gcc/gcc-4.2.1/602-sdk-libstdc++-includes.patch.lock new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gcc/gcc-4.2.1/740-sh-pr24836.patch.lock b/packages/gcc/gcc-4.2.1/740-sh-pr24836.patch.lock new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gcc/gcc-4.2.1/800-arm-bigendian.patch.lock b/packages/gcc/gcc-4.2.1/800-arm-bigendian.patch.lock new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gcc/gcc-4.2.1/904-flatten-switch-stmt-00.patch.lock b/packages/gcc/gcc-4.2.1/904-flatten-switch-stmt-00.patch.lock new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gcc/gcc-4.2.1/arm-nolibfloat.patch.lock b/packages/gcc/gcc-4.2.1/arm-nolibfloat.patch.lock new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gcc/gcc-4.2.1/arm-softfloat.patch.lock b/packages/gcc/gcc-4.2.1/arm-softfloat.patch.lock new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gcc/gcc-4.2.1/arm-thumb-cache.patch.lock b/packages/gcc/gcc-4.2.1/arm-thumb-cache.patch.lock new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gcc/gcc-4.2.1/arm-thumb.patch.lock b/packages/gcc/gcc-4.2.1/arm-thumb.patch.lock new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gcc/gcc-4.2.1/cache-amnesia.patch.lock b/packages/gcc/gcc-4.2.1/cache-amnesia.patch.lock new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gcc/gcc-4.2.1/fix-ICE-in-arm_unwind_emit_set.diff.lock b/packages/gcc/gcc-4.2.1/fix-ICE-in-arm_unwind_emit_set.diff.lock new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gcc/gcc-4.2.1/gcc41-configure.in.patch.lock b/packages/gcc/gcc-4.2.1/gcc41-configure.in.patch.lock new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gcc/gcc-4.2.1/ldflags.patch.lock b/packages/gcc/gcc-4.2.1/ldflags.patch.lock new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gcc/gcc-4.2.1/unbreak-armv4t.patch.lock b/packages/gcc/gcc-4.2.1/unbreak-armv4t.patch.lock new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gcc/gcc-4.2.1/zecke-no-host-includes.patch.lock b/packages/gcc/gcc-4.2.1/zecke-no-host-includes.patch.lock new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gcc/gcc-4.2.1/zecke-xgcc-cpp.patch.lock b/packages/gcc/gcc-4.2.1/zecke-xgcc-cpp.patch.lock new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gcc/gcc-cross_4.2.1.bb b/packages/gcc/gcc-cross_4.2.1.bb index 9025a98f3c..657e5afaca 100644 --- a/packages/gcc/gcc-cross_4.2.1.bb +++ b/packages/gcc/gcc-cross_4.2.1.bb @@ -5,7 +5,7 @@ inherit cross FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}" # NOTE: split PR. If the main .oe changes something that affects its *build* # remember to increment this one too. -PR = "r1" +PR = "r2" DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native" PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++" diff --git a/packages/gcc/gcc_4.2.1.bb b/packages/gcc/gcc_4.2.1.bb index 79d32d45ce..0ebc117d2a 100644 --- a/packages/gcc/gcc_4.2.1.bb +++ b/packages/gcc/gcc_4.2.1.bb @@ -1,4 +1,4 @@ -PR = "r0" +PR = "r1" DESCRIPTION = "The GNU cc and gcc C compilers." HOMEPAGE = "http://www.gnu.org/software/gcc/" SECTION = "devel" @@ -10,13 +10,19 @@ require gcc-package.inc SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://100-uclibc-conf.patch;patch=1 \ - file://200-uclibc-locale.patch;patch=1 \ + file://103-uclibc-conf-noupstream.patch;patch=1 \ + file://200-uclibc-locale.patch;patch=1 \ + file://203-uclibc-locale-no__x.patch;patch=1 \ file://300-libstdc++-pic.patch;patch=1 \ file://301-missing-execinfo_h.patch;patch=1 \ file://302-c99-snprintf.patch;patch=1 \ file://303-c99-complex-ugly-hack.patch;patch=1 \ file://304-index_macro.patch;patch=1 \ - file://602-sdk-libstdc++-includes.patch;patch=1 \ + file://305-libmudflap-susv3-legacy.patch;patch=1 \ + file://306-libstdc++-namespace.patch;patch=1 \ + file://307-locale_facets.patch;patch=1 \ + file://402-libbackend_dep_gcov-iov.h.patch;patch=1 \ + file://602-sdk-libstdc++-includes.patch;patch=1 \ file://740-sh-pr24836.patch;patch=1 \ file://800-arm-bigendian.patch;patch=1 \ file://904-flatten-switch-stmt-00.patch;patch=1 \ -- cgit v1.2.3 From 8f26b1bd408039f25115aa8b0c650b9bcc332926 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 27 Aug 2007 11:10:27 +0000 Subject: gcc: drop lock files --- packages/gcc/gcc-4.2.1/100-uclibc-conf.patch.lock | 0 packages/gcc/gcc-4.2.1/200-uclibc-locale.patch.lock | 0 packages/gcc/gcc-4.2.1/300-libstdc++-pic.patch.lock | 0 packages/gcc/gcc-4.2.1/301-missing-execinfo_h.patch.lock | 0 packages/gcc/gcc-4.2.1/302-c99-snprintf.patch.lock | 0 packages/gcc/gcc-4.2.1/303-c99-complex-ugly-hack.patch.lock | 0 packages/gcc/gcc-4.2.1/304-index_macro.patch.lock | 0 packages/gcc/gcc-4.2.1/602-sdk-libstdc++-includes.patch.lock | 0 packages/gcc/gcc-4.2.1/740-sh-pr24836.patch.lock | 0 packages/gcc/gcc-4.2.1/800-arm-bigendian.patch.lock | 0 packages/gcc/gcc-4.2.1/904-flatten-switch-stmt-00.patch.lock | 0 packages/gcc/gcc-4.2.1/arm-nolibfloat.patch.lock | 0 packages/gcc/gcc-4.2.1/arm-softfloat.patch.lock | 0 packages/gcc/gcc-4.2.1/arm-thumb-cache.patch.lock | 0 packages/gcc/gcc-4.2.1/arm-thumb.patch.lock | 0 packages/gcc/gcc-4.2.1/cache-amnesia.patch.lock | 0 packages/gcc/gcc-4.2.1/fix-ICE-in-arm_unwind_emit_set.diff.lock | 0 packages/gcc/gcc-4.2.1/gcc41-configure.in.patch.lock | 0 packages/gcc/gcc-4.2.1/ldflags.patch.lock | 0 packages/gcc/gcc-4.2.1/unbreak-armv4t.patch.lock | 0 packages/gcc/gcc-4.2.1/zecke-no-host-includes.patch.lock | 0 packages/gcc/gcc-4.2.1/zecke-xgcc-cpp.patch.lock | 0 22 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 packages/gcc/gcc-4.2.1/100-uclibc-conf.patch.lock delete mode 100644 packages/gcc/gcc-4.2.1/200-uclibc-locale.patch.lock delete mode 100644 packages/gcc/gcc-4.2.1/300-libstdc++-pic.patch.lock delete mode 100644 packages/gcc/gcc-4.2.1/301-missing-execinfo_h.patch.lock delete mode 100644 packages/gcc/gcc-4.2.1/302-c99-snprintf.patch.lock delete mode 100644 packages/gcc/gcc-4.2.1/303-c99-complex-ugly-hack.patch.lock delete mode 100644 packages/gcc/gcc-4.2.1/304-index_macro.patch.lock delete mode 100644 packages/gcc/gcc-4.2.1/602-sdk-libstdc++-includes.patch.lock delete mode 100644 packages/gcc/gcc-4.2.1/740-sh-pr24836.patch.lock delete mode 100644 packages/gcc/gcc-4.2.1/800-arm-bigendian.patch.lock delete mode 100644 packages/gcc/gcc-4.2.1/904-flatten-switch-stmt-00.patch.lock delete mode 100644 packages/gcc/gcc-4.2.1/arm-nolibfloat.patch.lock delete mode 100644 packages/gcc/gcc-4.2.1/arm-softfloat.patch.lock delete mode 100644 packages/gcc/gcc-4.2.1/arm-thumb-cache.patch.lock delete mode 100644 packages/gcc/gcc-4.2.1/arm-thumb.patch.lock delete mode 100644 packages/gcc/gcc-4.2.1/cache-amnesia.patch.lock delete mode 100644 packages/gcc/gcc-4.2.1/fix-ICE-in-arm_unwind_emit_set.diff.lock delete mode 100644 packages/gcc/gcc-4.2.1/gcc41-configure.in.patch.lock delete mode 100644 packages/gcc/gcc-4.2.1/ldflags.patch.lock delete mode 100644 packages/gcc/gcc-4.2.1/unbreak-armv4t.patch.lock delete mode 100644 packages/gcc/gcc-4.2.1/zecke-no-host-includes.patch.lock delete mode 100644 packages/gcc/gcc-4.2.1/zecke-xgcc-cpp.patch.lock (limited to 'packages') diff --git a/packages/gcc/gcc-4.2.1/100-uclibc-conf.patch.lock b/packages/gcc/gcc-4.2.1/100-uclibc-conf.patch.lock deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/gcc/gcc-4.2.1/200-uclibc-locale.patch.lock b/packages/gcc/gcc-4.2.1/200-uclibc-locale.patch.lock deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/gcc/gcc-4.2.1/300-libstdc++-pic.patch.lock b/packages/gcc/gcc-4.2.1/300-libstdc++-pic.patch.lock deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/gcc/gcc-4.2.1/301-missing-execinfo_h.patch.lock b/packages/gcc/gcc-4.2.1/301-missing-execinfo_h.patch.lock deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/gcc/gcc-4.2.1/302-c99-snprintf.patch.lock b/packages/gcc/gcc-4.2.1/302-c99-snprintf.patch.lock deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/gcc/gcc-4.2.1/303-c99-complex-ugly-hack.patch.lock b/packages/gcc/gcc-4.2.1/303-c99-complex-ugly-hack.patch.lock deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/gcc/gcc-4.2.1/304-index_macro.patch.lock b/packages/gcc/gcc-4.2.1/304-index_macro.patch.lock deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/gcc/gcc-4.2.1/602-sdk-libstdc++-includes.patch.lock b/packages/gcc/gcc-4.2.1/602-sdk-libstdc++-includes.patch.lock deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/gcc/gcc-4.2.1/740-sh-pr24836.patch.lock b/packages/gcc/gcc-4.2.1/740-sh-pr24836.patch.lock deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/gcc/gcc-4.2.1/800-arm-bigendian.patch.lock b/packages/gcc/gcc-4.2.1/800-arm-bigendian.patch.lock deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/gcc/gcc-4.2.1/904-flatten-switch-stmt-00.patch.lock b/packages/gcc/gcc-4.2.1/904-flatten-switch-stmt-00.patch.lock deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/gcc/gcc-4.2.1/arm-nolibfloat.patch.lock b/packages/gcc/gcc-4.2.1/arm-nolibfloat.patch.lock deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/gcc/gcc-4.2.1/arm-softfloat.patch.lock b/packages/gcc/gcc-4.2.1/arm-softfloat.patch.lock deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/gcc/gcc-4.2.1/arm-thumb-cache.patch.lock b/packages/gcc/gcc-4.2.1/arm-thumb-cache.patch.lock deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/gcc/gcc-4.2.1/arm-thumb.patch.lock b/packages/gcc/gcc-4.2.1/arm-thumb.patch.lock deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/gcc/gcc-4.2.1/cache-amnesia.patch.lock b/packages/gcc/gcc-4.2.1/cache-amnesia.patch.lock deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/gcc/gcc-4.2.1/fix-ICE-in-arm_unwind_emit_set.diff.lock b/packages/gcc/gcc-4.2.1/fix-ICE-in-arm_unwind_emit_set.diff.lock deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/gcc/gcc-4.2.1/gcc41-configure.in.patch.lock b/packages/gcc/gcc-4.2.1/gcc41-configure.in.patch.lock deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/gcc/gcc-4.2.1/ldflags.patch.lock b/packages/gcc/gcc-4.2.1/ldflags.patch.lock deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/gcc/gcc-4.2.1/unbreak-armv4t.patch.lock b/packages/gcc/gcc-4.2.1/unbreak-armv4t.patch.lock deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/gcc/gcc-4.2.1/zecke-no-host-includes.patch.lock b/packages/gcc/gcc-4.2.1/zecke-no-host-includes.patch.lock deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/gcc/gcc-4.2.1/zecke-xgcc-cpp.patch.lock b/packages/gcc/gcc-4.2.1/zecke-xgcc-cpp.patch.lock deleted file mode 100644 index e69de29bb2..0000000000 -- cgit v1.2.3 From 942a3bee1d73f2249f7cdb957717f4b223e9084d Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 27 Aug 2007 11:31:15 +0000 Subject: lmsensors-apps: totally changed packaging + build of sensors application lmsensors-apps contain all utils which do not need libsensors lmsensors-sensors contain 'sensors' application + config (it depend on libsensors) --- packages/lm_sensors/lmsensors-apps_2.10.1.bb | 40 ++++++++++++++++++---------- 1 file changed, 26 insertions(+), 14 deletions(-) (limited to 'packages') diff --git a/packages/lm_sensors/lmsensors-apps_2.10.1.bb b/packages/lm_sensors/lmsensors-apps_2.10.1.bb index bbe484f74e..84fe358647 100644 --- a/packages/lm_sensors/lmsensors-apps_2.10.1.bb +++ b/packages/lm_sensors/lmsensors-apps_2.10.1.bb @@ -1,32 +1,44 @@ -# lmsensors-apps .bb build file -# Copyright (C) 2006, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see /COPYING) - DESCRIPTION = "Hardware health monitoring applications" HOMEPAGE = "http://secure.netroedge.com/~lm78/" DEPENDS = "libsysfs virtual/libiconv" LICENSE = "GPL" -PR = "r1" +PR = "r2" SRC_URI = "http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${PV}.tar.gz \ file://iconv.patch;patch=1 \ + file://prefix-fix.patch;patch=1 \ file://add-sysfs-ldflags.patch;patch=1" S = "${WORKDIR}/lm_sensors-${PV}" do_compile() { - oe_runmake LINUX=${STAGING_KERNEL_DIR} EXLDFLAGS="${LDFLAGS}" user + oe_runmake LINUX=${STAGING_KERNEL_DIR} EXLDFLAGS="${LDFLAGS}" user PROG_EXTRA=sensors PREFIX=${prefix} } -APPS = "${S}/prog/dump/i2cdump ${S}/prog/dump/i2cset ${S}/prog/detect/i2cdetect" - do_install() { - install -d ${D}${bindir} - install -m 0755 ${APPS} ${D}${bindir} + oe_runmake user_install DESTDIR=${D} + + # backward compatibility with older OE packages + mv ${D}${sbindir}/* ${D}${bindir} + + # move manuals into proper place + install -d ${D}${mandir} + rm -rf ${D}${mandir}/* + mv ${D}/usr/man/* ${D}${mandir} + + # remove perl or bash scripts + rm ${D}${bindir}/*.pl ${D}${bindir}/ddcmon + rm ${D}${bindir}/fancontrol ${D}${bindir}/pwmconfig ${D}${bindir}/sensors-detect + rm ${D}${mandir}/man8/fancontrol.8 ${D}${mandir}/man8/pwmconfig.8 ${D}${mandir}/man8/sensors-detect.8 } -PACKAGES="sensors-i2cdump sensors-i2cset sensors-i2cdetect" +PACKAGES =+ "libsensors libsensors-dev libsensors-dbg libsensors-doc" +PACKAGES =+ "lmsensors-sensors lmsensors-sensors-dbg lmsensors-sensors-doc" -FILES_sensors-i2cdump="${bindir}/i2cdump" -FILES_sensors-i2cset="${bindir}/i2cset" -FILES_sensors-i2cdetect="${bindir}/i2cdetect" +FILES_lmsensors-sensors = "${bindir}/sensors ${sysconfdir}" +FILES_lmsensors-sensors-dbg = "${bindir}/.debug/sensors" +FILES_lmsensors-sensors-doc = "${mandir}/man1 ${mandir}/man5" +FILES_libsensors = "${libdir}/libsensors.so.*" +FILES_libsensors-dbg = "${libdir}/.debug" +FILES_libsensors-dev = "${libdir}/libsensors.so ${libdir}/libsensors.a ${includedir}" +FILES_libsensors-doc = "${mandir}/man3" -- cgit v1.2.3 From 57d651c2fb42d6497cdbb9fc40d7bc0a2e635bdb Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 27 Aug 2007 12:23:39 +0000 Subject: portmap: added 6.0 from Poky --- packages/portmap/portmap-6.0/.mtn2git_empty | 0 .../portmap/portmap-6.0/destdir-no-strip.patch | 44 ++++++++++++++++++++++ packages/portmap/portmap-6.0/no-libwrap.patch | 15 ++++++++ packages/portmap/portmap-6.0/no-tcpd-support.patch | 28 ++++++++++++++ packages/portmap/portmap.inc | 3 +- packages/portmap/portmap_6.0.bb | 18 +++++++++ 6 files changed, 107 insertions(+), 1 deletion(-) create mode 100644 packages/portmap/portmap-6.0/.mtn2git_empty create mode 100644 packages/portmap/portmap-6.0/destdir-no-strip.patch create mode 100644 packages/portmap/portmap-6.0/no-libwrap.patch create mode 100644 packages/portmap/portmap-6.0/no-tcpd-support.patch create mode 100644 packages/portmap/portmap_6.0.bb (limited to 'packages') diff --git a/packages/portmap/portmap-6.0/.mtn2git_empty b/packages/portmap/portmap-6.0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/portmap/portmap-6.0/destdir-no-strip.patch b/packages/portmap/portmap-6.0/destdir-no-strip.patch new file mode 100644 index 0000000000..a1563c7141 --- /dev/null +++ b/packages/portmap/portmap-6.0/destdir-no-strip.patch @@ -0,0 +1,44 @@ +From: Mike Frysinger +Date: Sun, 13 May 2007 21:15:12 +0000 (-0400) +Subject: respect DESTDIR and dont use -s with install +X-Git-Url: http://neil.brown.name/git?p=portmap;a=commitdiff_plain;h=603c59b978c04df2354f68d4a2dc676a758ff46d + +respect DESTDIR and dont use -s with install + +$(DESTDIR) is the standard for installing into other trees, not $(BASEDIR) ... +so I've converted the Makefile to use that. I've also left in $(BASEDIR) as a +default to support old installs; not sure if you'd just cut it. + +Stripping should be left to the person to handle, not automatically done by +the install step. Also, `install -s` always calls `strip` which is +wrong/undesired in cross-compiling scenarios. + +Signed-off-by: Mike Frysinger +Signed-off-by: Neil Brown +--- + +diff --git a/Makefile b/Makefile +index 9e9a4b4..5343428 100644 +--- a/Makefile ++++ b/Makefile +@@ -135,13 +135,14 @@ from_local: CPPFLAGS += -DTEST + portmap.man : portmap.8 + sed $(MAN_SED) < portmap.8 > portmap.man + ++DESTDIR = $(BASEDIR) + install: all +- install -o root -g root -m 0755 -s portmap ${BASEDIR}/sbin +- install -o root -g root -m 0755 -s pmap_dump ${BASEDIR}/sbin +- install -o root -g root -m 0755 -s pmap_set ${BASEDIR}/sbin +- install -o root -g root -m 0644 portmap.man ${BASEDIR}/usr/share/man/man8/portmap.8 +- install -o root -g root -m 0644 pmap_dump.8 ${BASEDIR}/usr/share/man/man8 +- install -o root -g root -m 0644 pmap_set.8 ${BASEDIR}/usr/share/man/man8 ++ install -o root -g root -m 0755 portmap $(DESTDIR)/sbin ++ install -o root -g root -m 0755 pmap_dump $(DESTDIR)/sbin ++ install -o root -g root -m 0755 pmap_set $(DESTDIR)/sbin ++ install -o root -g root -m 0644 portmap.man $(DESTDIR)/usr/share/man/man8/portmap.8 ++ install -o root -g root -m 0644 pmap_dump.8 $(DESTDIR)/usr/share/man/man8 ++ install -o root -g root -m 0644 pmap_set.8 $(DESTDIR)/usr/share/man/man8 + + clean: + rm -f *.o portmap pmap_dump pmap_set from_local \ diff --git a/packages/portmap/portmap-6.0/no-libwrap.patch b/packages/portmap/portmap-6.0/no-libwrap.patch new file mode 100644 index 0000000000..a880da6253 --- /dev/null +++ b/packages/portmap/portmap-6.0/no-libwrap.patch @@ -0,0 +1,15 @@ +Index: Makefile +=================================================================== +--- Makefile.orig 2007-05-15 16:00:17.000000000 +0200 ++++ Makefile 2007-05-15 16:00:55.000000000 +0200 +@@ -19,8 +19,8 @@ + # USE_DNS to add hostname tests in hosts.allow/deny. + + ifeq ($(NO_TCP_WRAPPER),) +-CPPFLAGS += -DHOSTS_ACCESS +-WRAP_LIB = -lwrap ++#CPPFLAGS += -DHOSTS_ACCESS ++#WRAP_LIB = -lwrap + ifdef USE_DNS + CPPFLAGS += -DENABLE_DNS + MAN_SED += -e 's/USE_DNS/yes/' diff --git a/packages/portmap/portmap-6.0/no-tcpd-support.patch b/packages/portmap/portmap-6.0/no-tcpd-support.patch new file mode 100644 index 0000000000..da55f3799d --- /dev/null +++ b/packages/portmap/portmap-6.0/no-tcpd-support.patch @@ -0,0 +1,28 @@ +From: Mike Frysinger +Date: Sun, 13 May 2007 21:17:32 +0000 (-0400) +Subject: fix building with tcpd support disabled +X-Git-Url: http://neil.brown.name/git?p=portmap;a=commitdiff_plain;h=7847207aed1b44faf077eed14a9ac9c68244eba5 + +fix building with tcpd support disabled + +Make sure pmap_check.c only includes tcpd.h when HOSTS_ACCESS is defined. + +Signed-off-by: Timothy Redaelli +Signed-off-by: Mike Frysinger +Signed-off-by: Neil Brown +--- + +diff --git a/pmap_check.c b/pmap_check.c +index 84f2c12..443a822 100644 +--- a/pmap_check.c ++++ b/pmap_check.c +@@ -44,7 +44,9 @@ + #include + #include + #endif ++#ifdef HOSTS_ACCESS + #include ++#endif + #include + #include + diff --git a/packages/portmap/portmap.inc b/packages/portmap/portmap.inc index bb9d2b6652..478a5ed357 100644 --- a/packages/portmap/portmap.inc +++ b/packages/portmap/portmap.inc @@ -20,8 +20,9 @@ do_compile() { oe_runmake } -do_install() { +fakeroot do_install() { install -d ${D}${sysconfdir}/init.d + install -d ${D}${base_sbindir} install -m 0755 ${WORKDIR}/portmap.init ${D}${sysconfdir}/init.d/portmap oe_runmake 'docdir=${docdir}/portmap' 'DESTDIR=${D}' install } diff --git a/packages/portmap/portmap_6.0.bb b/packages/portmap/portmap_6.0.bb new file mode 100644 index 0000000000..4b8b8c8d5c --- /dev/null +++ b/packages/portmap/portmap_6.0.bb @@ -0,0 +1,18 @@ +require portmap.inc + +SRC_URI = "http://neil.brown.name/portmap/portmap-6.0.tgz \ + file://destdir-no-strip.patch;patch=1 \ + file://no-tcpd-support.patch;patch=1 \ + file://no-libwrap.patch;patch=1;pnum=0 \ + file://portmap.init " + +S = "${WORKDIR}/${PN}_${PV}/" + +CPPFLAGS += "-DFACILITY=LOG_DAEMON -DENABLE_DNS" + +fakeroot do_install() { + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/portmap.init ${D}${sysconfdir}/init.d/portmap + install -d ${D}${mandir}/man8/ ${D}${base_sbindir} + oe_runmake install DESTDIR=${D} +} -- cgit v1.2.3 From dc227b443d68008ded204905dbd2cba3ff5e3d3c Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 27 Aug 2007 12:26:18 +0000 Subject: alsa: added 1.0.14 from Poky --- packages/alsa/alsa-lib/unbreak_plugindir.patch | 12 +++++ packages/alsa/alsa-lib_1.0.14.bb | 44 +++++++++++++++++++ packages/alsa/alsa-oss_1.0.14.bb | 17 +++++++ packages/alsa/alsa-utils_1.0.14.bb | 61 ++++++++++++++++++++++++++ 4 files changed, 134 insertions(+) create mode 100644 packages/alsa/alsa-lib/unbreak_plugindir.patch create mode 100644 packages/alsa/alsa-lib_1.0.14.bb create mode 100644 packages/alsa/alsa-oss_1.0.14.bb create mode 100644 packages/alsa/alsa-utils_1.0.14.bb (limited to 'packages') diff --git a/packages/alsa/alsa-lib/unbreak_plugindir.patch b/packages/alsa/alsa-lib/unbreak_plugindir.patch new file mode 100644 index 0000000000..7d13166809 --- /dev/null +++ b/packages/alsa/alsa-lib/unbreak_plugindir.patch @@ -0,0 +1,12 @@ +diff -Nur alsa-lib-1.0.14.orig/configure.in alsa-lib-1.0.14/configure.in +--- alsa-lib-1.0.14.orig/configure.in 2007-05-31 03:05:13.000000000 -0500 ++++ alsa-lib-1.0.14/configure.in 2007-08-18 13:05:49.000000000 -0500 +@@ -93,7 +93,7 @@ + esac + plugindir="$dir/$PACKAGE" + fi +-AC_DEFINE_UNQUOTED(ALSA_PLUGIN_DIR, "plugindir", [directory containing ALSA add-on modules]) ++AC_DEFINE_UNQUOTED(ALSA_PLUGIN_DIR, "${plugindir}", [directory containing ALSA add-on modules]) + ALSA_PLUGIN_DIR="$plugindir" + AC_SUBST(ALSA_PLUGIN_DIR) + diff --git a/packages/alsa/alsa-lib_1.0.14.bb b/packages/alsa/alsa-lib_1.0.14.bb new file mode 100644 index 0000000000..de805b9a4b --- /dev/null +++ b/packages/alsa/alsa-lib_1.0.14.bb @@ -0,0 +1,44 @@ +DESCRIPTION = "Alsa sound library" +HOMEPAGE = "http://www.alsa-project.org" +SECTION = "libs/multimedia" +LICENSE = "GPL" + +PR = "r1" + +# configure.in sets -D__arm__ on the command line for any arm system +# (not just those with the ARM instruction set), this should be removed, +# (or replaced by a permitted #define). +#FIXME: remove the following +ARM_INSTRUCTION_SET = "arm" + +SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \ + file://fix-tstamp-declaration.patch;patch=1 \ + file://unbreak_plugindir.patch;patch=1" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--with-cards=pdaudiocf --with-oss=yes" + +do_stage () { + oe_libinstall -so -C src libasound ${STAGING_LIBDIR}/ + install -d ${STAGING_INCDIR}/alsa/sound + install -m 0644 include/*.h ${STAGING_INCDIR}/alsa/ + install -m 0644 include/sound/ainstr*.h ${STAGING_INCDIR}/alsa/sound/ + install -d ${STAGING_DATADIR}/aclocal + install -m 0644 utils/alsa.m4 ${STAGING_DATADIR}/aclocal/ +} + +PACKAGES =+ "alsa-server libasound alsa-conf-base alsa-conf alsa-doc alsa-dev" +FILES_${PN}-dbg += "${libdir}/alsa-lib/*/.debu*" +FILES_libasound = "${libdir}/libasound.so.*" +FILES_alsa-server = "${bindir}/*" +FILES_alsa-conf = "${datadir}/alsa/" +FILES_alsa-dev += "${libdir}/pkgconfig/ /usr/include/ ${datadir}/aclocal/*" +FILES_alsa-conf-base = "\ +${datadir}/alsa/alsa.conf \ +${datadir}/alsa/cards/aliases.conf \ +${datadir}/alsa/pcm/default.conf \ +${datadir}/alsa/pcm/dmix.conf \ +${datadir}/alsa/pcm/dsnoop.conf" + +RDEPENDS_libasound = "alsa-conf-base" diff --git a/packages/alsa/alsa-oss_1.0.14.bb b/packages/alsa/alsa-oss_1.0.14.bb new file mode 100644 index 0000000000..b11947e86a --- /dev/null +++ b/packages/alsa/alsa-oss_1.0.14.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Alsa OSS Compatibility Package" +SECTION = "libs/multimedia" +LICENSE = "GPL" +DEPENDS = "alsa-lib" + +SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2" + +inherit autotools + +do_configure_prepend () { + touch NEWS README AUTHORS ChangeLog +} + +do_stage () { + oe_libinstall -C alsa -a -so libaoss ${STAGING_LIBDIR} + oe_libinstall -C alsa -a -so libalsatoss ${STAGING_LIBDIR} +} diff --git a/packages/alsa/alsa-utils_1.0.14.bb b/packages/alsa/alsa-utils_1.0.14.bb new file mode 100644 index 0000000000..240b995e7b --- /dev/null +++ b/packages/alsa/alsa-utils_1.0.14.bb @@ -0,0 +1,61 @@ +DESCRIPTION = "ALSA Utilities" +HOMEPAGE = "http://www.alsa-project.org" +SECTION = "console/utils" +LICENSE = "GPL" +DEPENDS = "alsa-lib ncurses" + +SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2" + +# lazy hack. needs proper fixing in gettext.m4, see +# http://bugs.openembedded.org/show_bug.cgi?id=2348 +# please close bug and remove this comment when properly fixed +# +EXTRA_OECONF_linux-uclibc = "--disable-nls" +EXTRA_OECONF_linux-uclibcgnueabi = "--disable-nls" + +inherit autotools + +# This are all packages that we need to make. Also, the now empty alsa-utils +# ipk depend on them. + +PACKAGES += "\ + alsa-utils-alsamixer \ + alsa-utils-midi \ + alsa-utils-aplay \ + alsa-utils-amixer \ + alsa-utils-aconnect \ + alsa-utils-iecset \ + alsa-utils-speakertest \ + alsa-utils-aseqnet \ + alsa-utils-aseqdump \ + alsa-utils-alsaconf \ + alsa-utils-alsactl " + +# We omit alsaconf, because +# a) this is a bash script +# b) it creates config files not suitable for OE-based distros + +FILES_${PN} = "" +FILES_alsa-utils-aplay = "${bindir}/aplay ${bindir}/arecord" +FILES_alsa-utils-amixer = "${bindir}/amixer" +FILES_alsa-utils-alsamixer = "${bindir}/alsamixer" +FILES_alsa-utils-speakertest = "${bindir}/speaker-test ${datadir}/sounds/alsa/ ${datadir}/alsa/" +FILES_alsa-utils-midi = "${bindir}/aplaymidi ${bindir}/arecordmidi ${bindir}/amidi" +FILES_alsa-utils-aconnect = "${bindir}/aconnect" +FILES_alsa-utils-aseqnet = "${bindir}/aseqnet" +FILES_alsa-utils-iecset = "${bindir}/iecset" +FILES_alsa-utils-alsactl = "${sbindir}/alsactl" +FILES_alsa-utils-aseqdump = "${bindir}/aseqdump" +FILES_alsa-utils-alsaconf = "${sbindir}/alsaconf" + +DESCRIPTION_alsa-utils-aplay = "play (and record) sound files via ALSA" +DESCRIPTION_alsa-utils-amixer = "command-line based control for ALSA mixer and settings" +DESCRIPTION_alsa-utils-alsamixer = "ncurses based control for ALSA mixer and settings" +DESCRIPTION_alsa-utils-speakertest = "ALSA surround speaker test utility" +DESCRIPTION_alsa-utils-midi = "miscalleanous MIDI utilities for ALSA" +DESCRIPTION_alsa-utils-aconnect = "ALSA sequencer connection manager" +DESCRIPTION_alsa-utils-aseqnet = "network client/server on ALSA sequencer" +DESCRIPTION_alsa-utils-alsactl = "saves/restores ALSA-settings in /etc/asound.state" +DESCRIPTION_alsa-utils-alsaconf = "a bash script that creates ALSA configuration files" + +ALLOW_EMPTY_alsa-utils = "1" -- cgit v1.2.3 From 2e2d762a296bdc3b5ac6f6a0df1278872c93d9f8 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Mon, 27 Aug 2007 12:43:52 +0000 Subject: xserver-common: Add 1.18, drop some older versions. --- packages/xserver-common/xserver-common_1.10.bb | 12 ------------ packages/xserver-common/xserver-common_1.17.bb | 16 ---------------- packages/xserver-common/xserver-common_1.18.bb | 16 ++++++++++++++++ packages/xserver-common/xserver-common_1.3.bb | 3 --- packages/xserver-common/xserver-common_1.8.bb | 10 ---------- packages/xserver-common/xserver-common_1.9.bb | 12 ------------ 6 files changed, 16 insertions(+), 53 deletions(-) delete mode 100644 packages/xserver-common/xserver-common_1.10.bb delete mode 100644 packages/xserver-common/xserver-common_1.17.bb create mode 100644 packages/xserver-common/xserver-common_1.18.bb delete mode 100644 packages/xserver-common/xserver-common_1.3.bb delete mode 100644 packages/xserver-common/xserver-common_1.8.bb delete mode 100644 packages/xserver-common/xserver-common_1.9.bb (limited to 'packages') diff --git a/packages/xserver-common/xserver-common_1.10.bb b/packages/xserver-common/xserver-common_1.10.bb deleted file mode 100644 index 69e92ecdf3..0000000000 --- a/packages/xserver-common/xserver-common_1.10.bb +++ /dev/null @@ -1,12 +0,0 @@ -require xserver-common.inc - -PR = "r2" - -SRC_URI_append = " file://setDPI.sh \ - file://calibrate_zaurusd.patch;patch=1 \ - file://w100.patch;patch=1 \ - file://poodle-xmodmap-2.6.patch;patch=1" - -do_install_append() { - install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi" -} diff --git a/packages/xserver-common/xserver-common_1.17.bb b/packages/xserver-common/xserver-common_1.17.bb deleted file mode 100644 index a30a37c893..0000000000 --- a/packages/xserver-common/xserver-common_1.17.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "Common X11 scripts and support files" -LICENSE = "GPL" -SECTION = "x11" -RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo" -PR = "r0" - -PACKAGE_ARCH = "all" - -# we are using a gpe-style Makefile -inherit gpe - -SRC_URI_append = " file://setDPI.sh " - -do_install_append() { - install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi" -} diff --git a/packages/xserver-common/xserver-common_1.18.bb b/packages/xserver-common/xserver-common_1.18.bb new file mode 100644 index 0000000000..a30a37c893 --- /dev/null +++ b/packages/xserver-common/xserver-common_1.18.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Common X11 scripts and support files" +LICENSE = "GPL" +SECTION = "x11" +RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo" +PR = "r0" + +PACKAGE_ARCH = "all" + +# we are using a gpe-style Makefile +inherit gpe + +SRC_URI_append = " file://setDPI.sh " + +do_install_append() { + install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi" +} diff --git a/packages/xserver-common/xserver-common_1.3.bb b/packages/xserver-common/xserver-common_1.3.bb deleted file mode 100644 index af2fb894b5..0000000000 --- a/packages/xserver-common/xserver-common_1.3.bb +++ /dev/null @@ -1,3 +0,0 @@ -require xserver-common.inc - -PR = "r1" diff --git a/packages/xserver-common/xserver-common_1.8.bb b/packages/xserver-common/xserver-common_1.8.bb deleted file mode 100644 index 249576f6da..0000000000 --- a/packages/xserver-common/xserver-common_1.8.bb +++ /dev/null @@ -1,10 +0,0 @@ -require xserver-common.inc - -PR = "r2" - -SRC_URI_append = " file://setDPI.sh \ - file://calibrate_zaurusd.patch;patch=1" - -do_install_append() { - install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi" -} diff --git a/packages/xserver-common/xserver-common_1.9.bb b/packages/xserver-common/xserver-common_1.9.bb deleted file mode 100644 index a8343a8548..0000000000 --- a/packages/xserver-common/xserver-common_1.9.bb +++ /dev/null @@ -1,12 +0,0 @@ -require xserver-common.inc - -PR = "r2" - -SRC_URI_append = " file://setDPI.sh \ - file://calibrate_zaurusd.patch;patch=1 \ - file://poodle-xmodmap-2.6.patch;patch=1 \ - file://rxvt-less-pink.diff;patch=1" - -do_install_append() { - install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi" -} -- cgit v1.2.3 From dfa0cc8b70cee3af10c06fe2eccaab75dbcb7555 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 27 Aug 2007 12:46:20 +0000 Subject: avahi: attempt #1 to stop it building python by default --- packages/avahi/avahi-python_0.6.21.bb | 4 ++++ packages/avahi/avahi.inc | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'packages') diff --git a/packages/avahi/avahi-python_0.6.21.bb b/packages/avahi/avahi-python_0.6.21.bb index 8eaac073ac..eea8295ac8 100644 --- a/packages/avahi/avahi-python_0.6.21.bb +++ b/packages/avahi/avahi-python_0.6.21.bb @@ -11,4 +11,8 @@ SRC_URI += "file://dbus-pre-1.1.1-support.patch;patch=1 \ file://configure-check-pymod.patch;patch=1" S = "${WORKDIR}/avahi-${PV}" +RDEPENDS_avahi-discover = "python-avahi python-pygtk" +RDEPENDS_python-avahi = "python-dbus" +PACKAGES =+ "python-avahi" + AVAHI_PYTHON = "--enable-python" diff --git a/packages/avahi/avahi.inc b/packages/avahi/avahi.inc index 991d282a3e..3864dc5135 100644 --- a/packages/avahi/avahi.inc +++ b/packages/avahi/avahi.inc @@ -12,8 +12,6 @@ DEPENDS = "expat libdaemon dbus glib-2.0" RRECOMMENDS_avahi-daemon_append_linux = "libnss-mdns" RDEPENDS_avahi-daemon = "sysvinit-pidof update-rc.d" RDEPENDS_avahi-autoipd = "update-rc.d" -RDEPENDS_avahi-discover = "python-avahi python-pygtk" -RDEPENDS_python-avahi = "python-dbus" SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \ file://00avahi-autoipd file://99avahi-autoipd" @@ -28,7 +26,7 @@ EXTRA_OECONF = "--with-distro=debian --disable-gdbm ${AVAHI_GTK} --disable-mono AVAHI_PYTHON = "--disable-python" AVAHI_GTK = "--disable-gtk" -PACKAGES =+ "avahi-daemon avahi-discover libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-ui avahi-discover-standalone avahi-autoipd avahi-utils python-avahi" +PACKAGES =+ "avahi-daemon avahi-discover libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-ui avahi-discover-standalone avahi-autoipd avahi-utils" FILES_libavahi-common = "${libdir}/libavahi-common.so.*" FILES_libavahi-core = "${libdir}/libavahi-core.so.*" -- cgit v1.2.3 From 17698600f5c1d39eed9ac09334ce0c059529a1c7 Mon Sep