From 6f7f237a4067891355df5f8379bd3cca39076c61 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 6 Aug 2007 10:17:57 +0000 Subject: pkgconfig-native: reinstate default pref --- packages/pkgconfig/pkgconfig-native_0.22.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/pkgconfig/pkgconfig-native_0.22.bb b/packages/pkgconfig/pkgconfig-native_0.22.bb index 5a5423058d..4481656d7a 100644 --- a/packages/pkgconfig/pkgconfig-native_0.22.bb +++ b/packages/pkgconfig/pkgconfig-native_0.22.bb @@ -2,6 +2,8 @@ SECTION = "console/utils" require pkgconfig.inc FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/pkgconfig-${PV}" +DEFAULT_PREFERENCE = "-1" + S = "${WORKDIR}/pkg-config-${PV}/" inherit native DEPENDS = "" @@ -11,4 +13,4 @@ do_configure() { libtoolize --force oe_runconf } - \ No newline at end of file + -- cgit v1.2.3 From 39246ac4dc1efaa5b59db8a5b75653e48d553072 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Mon, 6 Aug 2007 11:00:44 +0000 Subject: ixp4xx-kernel: built the ixp4xx-npe module into the kernel, so it can accept a microcode image found in an MTD partition --- packages/linux/ixp4xx-kernel/2.6.21/defconfig | 2 +- packages/linux/ixp4xx-kernel_2.6.21.6.bb | 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 56474d512a..0fbb58a561 100644 --- a/packages/linux/ixp4xx-kernel/2.6.21/defconfig +++ b/packages/linux/ixp4xx-kernel/2.6.21/defconfig @@ -885,7 +885,7 @@ CONFIG_TUN=m CONFIG_NET_ETHERNET=y CONFIG_MII=m CONFIG_IXP4XX_QMGR=m -CONFIG_IXP4XX_NPE=m +CONFIG_IXP4XX_NPE=y CONFIG_IXP4XX_NPE_FW_LOAD=y CONFIG_IXP4XX_NPE_FW_MTD=y CONFIG_IXP4XX_MAC=m diff --git a/packages/linux/ixp4xx-kernel_2.6.21.6.bb b/packages/linux/ixp4xx-kernel_2.6.21.6.bb index ff90bcb3b3..b0ba8ba787 100644 --- a/packages/linux/ixp4xx-kernel_2.6.21.6.bb +++ b/packages/linux/ixp4xx-kernel_2.6.21.6.bb @@ -6,7 +6,7 @@ # http://trac.nslu2-linux.org/kernel/ # # The revision that is pulled from SVN is specified below -IXP4XX_KERNEL_SVN_REV = "914" +IXP4XX_KERNEL_SVN_REV = "915" # # The directory containing the patches to be applied is # specified below -- cgit v1.2.3 From 2726e2e97adfbc8117559309e88dfa49baf847b2 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Mon, 6 Aug 2007 11:02:55 +0000 Subject: slugos: Made sure the IXP modules are in the rootfs, and bumped the slugos revision in preparation for testing before a binary release --- packages/tasks/task-slugos.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/tasks/task-slugos.bb b/packages/tasks/task-slugos.bb index d2281bca17..21f1b551f5 100644 --- a/packages/tasks/task-slugos.bb +++ b/packages/tasks/task-slugos.bb @@ -6,7 +6,7 @@ DESCRIPTION = "Task packages for the SlugOS distribution" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r12" +PR = "r13" PACKAGE_ARCH = "${MACHINE_ARCH}" ALLOW_EMPTY = "1" @@ -92,6 +92,9 @@ kernel-module-pata-artop \ # Add modules required for Network support SLUGOS_STANDARD_RRECOMMENDS += "\ +kernel-module-mii \ +kernel-module-ixp4xx-mac \ +kernel-module-ixp4xx-qmgr \ kernel-module-via-velocity \ " -- cgit v1.2.3 From 3b0dbf13c1f7e06597ba0c2e18345317b5b7298c Mon Sep 17 00:00:00 2001 From: Stelios Koroneos Date: Mon, 6 Aug 2007 11:57:26 +0000 Subject: packages/xorg-lib/libx11_1.1.2.bb : Fix an issue when building for Efika, where it used target toolchain to build makekeys which is need to run on the host --- packages/xorg-lib/libx11_1.1.2.bb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'packages') diff --git a/packages/xorg-lib/libx11_1.1.2.bb b/packages/xorg-lib/libx11_1.1.2.bb index bab2277fd0..e6b0ec5d8b 100644 --- a/packages/xorg-lib/libx11_1.1.2.bb +++ b/packages/xorg-lib/libx11_1.1.2.bb @@ -5,17 +5,19 @@ DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ libxdmcp xf86bigfontproto kbproto inputproto" PROVIDES = "virtual/libx11" PE = "1" +PR = "r1" XORG_PN = "libX11" EXTRA_OECONF += "--without-xcb" do_compile() { - ( - unset CC LD CXX CCLD - oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys - ) - oe_runmake + ( + unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS + cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys + cd ../../ + ) || exit 1 + oe_runmake } FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt" -- cgit v1.2.3 From 43298cfac57ec70d3184147b1e2639511cba3103 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 6 Aug 2007 12:06:48 +0000 Subject: libx11: remove RPROVIDES --- packages/xorg-lib/libx11_1.1.1.bb | 3 +-- packages/xorg-lib/libx11_git.bb | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'packages') diff --git a/packages/xorg-lib/libx11_1.1.1.bb b/packages/xorg-lib/libx11_1.1.1.bb index 023f15cef3..f6b2774ae5 100644 --- a/packages/xorg-lib/libx11_1.1.1.bb +++ b/packages/xorg-lib/libx11_1.1.1.bb @@ -1,13 +1,12 @@ require xorg-lib-common.inc PE = "1" -PR = "r2" +PR = "r3" DESCRIPTION = "Base X libs." DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ libxcb libxdmcp xf86bigfontproto kbproto inputproto" PROVIDES = "virtual/libx11" -RPROVIDES = "virtual/libx11" XORG_PN = "libX11" diff --git a/packages/xorg-lib/libx11_git.bb b/packages/xorg-lib/libx11_git.bb index f2929624e8..ecd4b542e9 100644 --- a/packages/xorg-lib/libx11_git.bb +++ b/packages/xorg-lib/libx11_git.bb @@ -5,8 +5,7 @@ SECTION = "x11/libs" LICENSE = "XFree86" DEPENDS = "libxcb xproto xextproto libxau xtrans libxdmcp xcmiscproto xf86bigfontproto kbproto inputproto bigreqsproto util-macros" PROVIDES = "virtual/libx11" -RPROVIDES = "virtual/libx11" -PR = "r1" +PR = "r2" FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB" FILES_${PN}-locale += "${datadir}/X11/locale" -- cgit v1.2.3 From 0542056b9b1e7d7b5d587557fccb2e0e57d96232 Mon Sep 17 00:00:00 2001 From: Stelios Koroneos Date: Mon, 6 Aug 2007 12:49:55 +0000 Subject: packages/xorg-lib/libx11 : Fix makekeys generation on all libx11 bb packages --- packages/xorg-lib/libx11_1.1.1.bb | 14 ++++++++------ packages/xorg-lib/libx11_git.bb | 15 +++++++++------ 2 files changed, 17 insertions(+), 12 deletions(-) (limited to 'packages') diff --git a/packages/xorg-lib/libx11_1.1.1.bb b/packages/xorg-lib/libx11_1.1.1.bb index f6b2774ae5..7ac5b58345 100644 --- a/packages/xorg-lib/libx11_1.1.1.bb +++ b/packages/xorg-lib/libx11_1.1.1.bb @@ -1,6 +1,6 @@ require xorg-lib-common.inc PE = "1" -PR = "r3" +PR = "r4" DESCRIPTION = "Base X libs." @@ -19,9 +19,11 @@ FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" FILES_${PN}-xcb = "${libdir}/libX11-xcb.so.*" do_compile() { - ( - unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS - cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys - ) || exit 1 - oe_runmake + ( + unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS + cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys + cd ../../ + ) || exit 1 + oe_runmake } + diff --git a/packages/xorg-lib/libx11_git.bb b/packages/xorg-lib/libx11_git.bb index ecd4b542e9..422afc92e0 100644 --- a/packages/xorg-lib/libx11_git.bb +++ b/packages/xorg-lib/libx11_git.bb @@ -5,7 +5,7 @@ SECTION = "x11/libs" LICENSE = "XFree86" DEPENDS = "libxcb xproto xextproto libxau xtrans libxdmcp xcmiscproto xf86bigfontproto kbproto inputproto bigreqsproto util-macros" PROVIDES = "virtual/libx11" -PR = "r2" +PR = "r3" FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB" FILES_${PN}-locale += "${datadir}/X11/locale" @@ -17,14 +17,17 @@ inherit autotools pkgconfig EXTRA_OECONF="--enable-malloc0returnsnull" + do_compile() { - ( - unset CC LD CXX CCLD - oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys - ) - oe_runmake + ( + unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS + cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys + cd ../../ + ) || exit 1 + oe_runmake } + do_stage() { autotools_stage_all } -- cgit v1.2.3 From 073a4b33442d36b178883d3315b0ad0bdc36d124 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 6 Aug 2007 14:38:44 +0000 Subject: angstrom-x11-base-depends: remove RDEPENDS on virtual/x11, apps link to it anyway --- packages/angstrom/angstrom-x11-base-depends.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/angstrom/angstrom-x11-base-depends.bb b/packages/angstrom/angstrom-x11-base-depends.bb index 036e513547..2eb3a36804 100644 --- a/packages/angstrom/angstrom-x11-base-depends.bb +++ b/packages/angstrom/angstrom-x11-base-depends.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Task packages for the Angstrom distribution" -PR = "r33" +PR = "r34" ALLOW_EMPTY = "1" XSERVER ?= "xserver-kdrive-fbdev" @@ -9,7 +9,6 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" DEPENDS = "virtual/xserver" RDEPENDS = "\ - virtual/libx11 \ ${XSERVER} \ ttf-dejavu-sans \ ttf-dejavu-sans-mono \ -- cgit v1.2.3 From d35d6c7918a7fb272b085a3290e9389f80ab0e0d Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Mon, 6 Aug 2007 15:11:17 +0000 Subject: libmimedir: Add 0.4 2 --- packages/libmimedir/libmimedir_0.4.2.bb | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 packages/libmimedir/libmimedir_0.4.2.bb (limited to 'packages') diff --git a/packages/libmimedir/libmimedir_0.4.2.bb b/packages/libmimedir/libmimedir_0.4.2.bb new file mode 100644 index 0000000000..2f7cc4c3e8 --- /dev/null +++ b/packages/libmimedir/libmimedir_0.4.2.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "RFC2425 MIME Directory Profile library, supporting vCard and iCalendar" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "LGPL" +DEPENDS = "intltool-native" +PR = "r0" + +inherit autotools pkgconfig gpe + +EXTRA_OECONF = "--disable-gtk-doc" + +do_stage() { + autotools_stage_all +} + + +PACKAGES += "libmimedir-utils" +FILES_libmimedir-utils = "${bindir}" +FILES_${PN} = "${libdir}/*.so.*" -- cgit v1.2.3