From 0f58092c991ced1629b1b30bd08e2ea823d46c8d Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 11:36:39 +0000 Subject: xserver-kdrive-1.2: fix enable-tslib.patch --- .../xserver-kdrive-1.2.0/enable-tslib.patch | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-tslib.patch b/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-tslib.patch index 1e72a3ea53..615f27a7c1 100644 --- a/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-tslib.patch +++ b/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-tslib.patch @@ -13,7 +13,7 @@ Index: xorg-server-1.2.0/hw/kdrive/fbdev/Makefile.am libfbdev_a_SOURCES = \ fbdev.c \ fbdev.h -@@ -16,7 +20,10 @@ +@@ -16,7 +20,8 @@ Xfbdev_LDADD = \ libfbdev.a \ @KDRIVE_LIBS@ \ @@ -22,7 +22,16 @@ Index: xorg-server-1.2.0/hw/kdrive/fbdev/Makefile.am + $(TSLIB_FLAG) Xfbdev_DEPENDENCIES = \ -- libfbdev.a -+ libfbdev.a \ -+ @KDRIVE_LIBS@ -+ + libfbdev.a +Index: xorg-server-1.2.0/configure.ac +=================================================================== +--- xorg-server-1.2.0.orig/configure.ac 2007-03-29 13:28:10.000000000 +0200 ++++ xorg-server-1.2.0/configure.ac 2007-03-29 13:28:35.000000000 +0200 +@@ -1517,6 +1517,7 @@ + AC_MSG_ERROR([tslib must be installed to build the tslib driver. See http://tslib.berlios.de/]) + fi + AC_DEFINE(TSLIB, 1, [Have tslib support]) ++ AC_DEFINE(TOUCHSCREEN, 1, [Have touchscreen support]) + fi + + # damage shadow extension glx (NOTYET) fb mi -- cgit v1.2.3 From edc40a59a0f44223deacd1291e5e80b7b9360897 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 29 Mar 2007 11:56:01 +0000 Subject: packages/apt/apt_0.6.46.2.bb packages/apt/apt.inc packages/apt/apt-package.inc : build and package shared libs at all times. --- packages/apt/apt-package.inc | 17 ++++++++++++----- packages/apt/apt.inc | 6 ++++-- packages/apt/apt_0.6.46.2.bb | 3 +++ packages/apt/files/environment.patch | 13 +++++++++++++ 4 files changed, 32 insertions(+), 7 deletions(-) create mode 100644 packages/apt/files/environment.patch diff --git a/packages/apt/apt-package.inc b/packages/apt/apt-package.inc index 8bf2b56739..5a5d56930e 100644 --- a/packages/apt/apt-package.inc +++ b/packages/apt/apt-package.inc @@ -77,11 +77,18 @@ do_install () { install -m 0755 bin/apt-sortpkgs ${D}${bindir}/ install -m 0755 bin/apt-extracttemplates ${D}${bindir}/ - #eval `cat environment.mak | grep ^GLIBC_VER | sed -e's, = ,=,'` - #oe_libinstall -so -C bin libapt-pkg$GLIBC_VER-6 ${D}${libdir}/ || true - #ln -sf libapt-pkg$GLIBC_VER-6.so ${D}${libdir}/libapt-pkg.so - #oe_libinstall -so -C bin libapt-inst$GLIBC_VER-6 ${D}${libdir}/ || true - #ln -sf libapt-inst$GLIBC_VER-6.so ${D}${libdir}/libapt-inst.so + install -d ${D}${libdir} + eval `cat environment.mak | grep ^GLIBC_VER | sed -e's, = ,=,'` + eval `cat apt-pkg/makefile | grep ^MAJOR | sed -e's, = ,=,'` + eval `cat apt-pkg/makefile | grep ^MINOR | sed -e's, = ,=,'` + install bin/libapt-pkg$GLIBC_VER-6.so.$MAJOR.$MINOR ${D}${libdir}/ + ln -sf libapt-pkg$GLIBC_VER-6.so.$MAJOR.$MINOR ${D}${libdir}/libapt-pkg$GLIBC_VER-6.so.$MAJOR + ln -sf libapt-pkg$GLIBC_VER-6.so.$MAJOR.$MINOR ${D}${libdir}/libapt-pkg.so + eval `cat apt-inst/makefile | grep ^MAJOR | sed -e's, = ,=,'` + eval `cat apt-inst/makefile | grep ^MINOR | sed -e's, = ,=,'` + install bin/libapt-inst$GLIBC_VER-6.so.$MAJOR.$MINOR ${D}${libdir}/ + ln -sf libapt-inst$GLIBC_VER-6.so.$MAJOR.$MINOR ${D}${libdir}/libapt-inst$GLIBC_VER-6.so.$MAJOR + ln -sf libapt-inst$GLIBC_VER-6.so.$MAJOR.$MINOR ${D}${libdir}/libapt-inst.so install -d ${D}${libdir}/apt/methods install -m 0755 bin/methods/* ${D}${libdir}/apt/methods/ diff --git a/packages/apt/apt.inc b/packages/apt/apt.inc index dbf5765205..283b80d662 100644 --- a/packages/apt/apt.inc +++ b/packages/apt/apt.inc @@ -2,7 +2,8 @@ DESCRIPTION = "Advanced front-end for dpkg." LICENSE = "GPL" SECTION = "base" -SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz" +SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz \ + file://environment.patch;patch=1" S = "${WORKDIR}/apt-${PV}" inherit autotools gettext @@ -12,4 +13,5 @@ EXTRA_AUTORECONF = "--exclude=autopoint,autoheader" # Apt wants to know the glibc version by running a binary file, which will fail, so we have to tell configure which version to use # Since I don't know the impliations of setting a wrong value I only provide one for angstrom, which uses glibc 2.5 (which claims to be 2.4) # Koen - 20070327 -EXTRA_OECONF_angstrom += " ac_cv_glibc_ver=libc6.4" +EXTRA_OECONF_append_angstrom = " ac_cv_glibc_ver=libc6.4" + diff --git a/packages/apt/apt_0.6.46.2.bb b/packages/apt/apt_0.6.46.2.bb index 73285f37c3..24023f2a58 100644 --- a/packages/apt/apt_0.6.46.2.bb +++ b/packages/apt/apt_0.6.46.2.bb @@ -6,3 +6,6 @@ require apt-package.inc FILES_${PN} += "${bindir}/apt-key" apt-manpages += "doc/apt-key.8" + +PR = "r1" + diff --git a/packages/apt/files/environment.patch b/packages/apt/files/environment.patch new file mode 100644 index 0000000000..5bea1a0130 --- /dev/null +++ b/packages/apt/files/environment.patch @@ -0,0 +1,13 @@ +Index: apt-0.6.46.2/buildlib/environment.mak.in +=================================================================== +--- apt-0.6.46.2.orig/buildlib/environment.mak.in 2007-03-29 11:38:58.000000000 +0100 ++++ apt-0.6.46.2/buildlib/environment.mak.in 2007-03-29 11:39:12.000000000 +0100 +@@ -62,7 +62,7 @@ + + # Shared library things + HOST_OS = @host_os@ +-ifneq ($(words $(filter linux-gnu gnu% %gnu,$(HOST_OS))),0) ++ifneq ($(words $(filter linux-gnu linux-gnueabi gnu% %gnu,$(HOST_OS))),0) + SONAME_MAGIC=-Wl,-soname -Wl, + LFLAGS_SO= + else -- cgit v1.2.3 From e916916c968c82478b0d4f3b09e25a49405ae04a Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 12:04:44 +0000 Subject: xserver-kdrive: drop devfs.patch, nobody uses it anymore. --- packages/xorg-xserver/xserver-kdrive/devfs.patch | 47 ------------------------ 1 file changed, 47 deletions(-) delete mode 100644 packages/xorg-xserver/xserver-kdrive/devfs.patch diff --git a/packages/xorg-xserver/xserver-kdrive/devfs.patch b/packages/xorg-xserver/xserver-kdrive/devfs.patch deleted file mode 100644 index a6238126c0..0000000000 --- a/packages/xorg-xserver/xserver-kdrive/devfs.patch +++ /dev/null @@ -1,47 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- xserver/hw/kdrive/linux/linux.c~devfs -+++ xserver/hw/kdrive/linux/linux.c -@@ -82,10 +82,10 @@ - vtno = kdVirtualTerminal; - else - { -- if ((fd = open("/dev/tty0",O_WRONLY,0)) < 0) -+ if ((fd = open("/dev/vc/0",O_WRONLY,0)) < 0) - { - FatalError( -- "LinuxInit: Cannot open /dev/tty0 (%s)\n", -+ "LinuxInit: Cannot open /dev/tty/0 (%s)\n", - strerror(errno)); - } - if ((ioctl(fd, VT_OPENQRY, &vtno) < 0) || -@@ -96,7 +96,7 @@ - } - close(fd); - -- sprintf(vtname,"/dev/tty%d",vtno); /* /dev/tty1-64 */ -+ sprintf(vtname,"/dev/vc/%d",vtno); /* /dev/tty1-64 */ - - if ((LinuxConsoleFd = open(vtname, O_RDWR|O_NDELAY, 0)) < 0) - { -@@ -113,7 +113,7 @@ - * - * Why is this needed? - */ -- LinuxCheckChown ("/dev/tty0"); -+ LinuxCheckChown ("/dev/vc/0"); - /* - * Linux doesn't switch to an active vt after the last close of a vt, - * so we do this ourselves by remembering which is active now. -@@ -453,7 +453,7 @@ - activeVT = -1; - } - close(LinuxConsoleFd); /* make the vt-manager happy */ -- fd = open ("/dev/tty0", O_RDWR|O_NDELAY, 0); -+ fd = open ("/dev/vc/0", O_RDWR|O_NDELAY, 0); - if (fd >= 0) - { - memset (&vts, '\0', sizeof (vts)); /* valgrind */ -- cgit v1.2.3 From fd6a046d64f69c38be873309680b16c656dbb1f0 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 12:05:33 +0000 Subject: xserver-kdrive-1.2: simplify enable-tslib.patch --- .../xserver-kdrive-1.2.0/enable-tslib.patch | 25 ---------------------- 1 file changed, 25 deletions(-) diff --git a/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-tslib.patch b/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-tslib.patch index 615f27a7c1..9a59530ed3 100644 --- a/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-tslib.patch +++ b/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-tslib.patch @@ -1,28 +1,3 @@ -Index: xorg-server-1.2.0/hw/kdrive/fbdev/Makefile.am -=================================================================== ---- xorg-server-1.2.0.orig/hw/kdrive/fbdev/Makefile.am 2007-03-29 11:53:24.000000000 +0200 -+++ xorg-server-1.2.0/hw/kdrive/fbdev/Makefile.am 2007-03-29 11:53:27.000000000 +0200 -@@ -6,6 +6,10 @@ - - bin_PROGRAMS = Xfbdev - -+if TSLIB -+TSLIB_FLAG = -lts -+endif -+ - libfbdev_a_SOURCES = \ - fbdev.c \ - fbdev.h -@@ -16,7 +20,8 @@ - Xfbdev_LDADD = \ - libfbdev.a \ - @KDRIVE_LIBS@ \ -- @XSERVER_LIBS@ -+ @XSERVER_LIBS@ \ -+ $(TSLIB_FLAG) - - Xfbdev_DEPENDENCIES = \ - libfbdev.a Index: xorg-server-1.2.0/configure.ac =================================================================== --- xorg-server-1.2.0.orig/configure.ac 2007-03-29 13:28:10.000000000 +0200 -- cgit v1.2.3 From 0bb019850b4d6e84a81c4b06485280a02e1b5a72 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 12:48:15 +0000 Subject: package_ipk.bbclass: add epoch support --- classes/package_ipk.bbclass | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass index 70bcdf6b7f..19c082d978 100644 --- a/classes/package_ipk.bbclass +++ b/classes/package_ipk.bbclass @@ -142,7 +142,11 @@ python do_package_ipk () { raise bb.build.FuncFailed("unable to open control file for writing.") fields = [] - fields.append(["Version: %s-%s\n", ['PV', 'PR']]) + pe = bb.data.getVar('PE', d, 1) + if pe and int(pe) > 0: + fields.append(["Version: %s:%s-%s\n", ['PE', 'PV', 'PR']]) + else: + fields.append(["Version: %s-%s\n", ['PV', 'PR']]) fields.append(["Description: %s\n", ['DESCRIPTION']]) fields.append(["Section: %s\n", ['SECTION']]) fields.append(["Priority: %s\n", ['PRIORITY']]) -- cgit v1.2.3 From 427c202b3f3419a517b12a75774d6ad2837243e3 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 12:50:43 +0000 Subject: bitbake.conf: add epoch support --- conf/bitbake.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 947afc3018..12f663ae4b 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -82,7 +82,8 @@ ASSUME_PROVIDED = "cvs-native svn-native bzip2-native diffstat-native patch-nati PN = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[0] or 'defaultpkgname'}" PV = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[1] or '1.0'}" PR = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[2] or 'r0'}" -PF = "${PN}-${PV}-${PR}" +PF = "${PN}-${EXTENDPE}${PV}-${PR}" +EXTENDPE = "${@['','${PE\x7d_'][bb.data.getVar('PE',d,1) > 0]}" P = "${PN}-${PV}" # Package info. -- cgit v1.2.3 From 7ca9b39e2634a00c8af78f84f14fca369d946811 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 12:57:43 +0000 Subject: package_deb.bbclass: add epoch support --- classes/package_deb.bbclass | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/classes/package_deb.bbclass b/classes/package_deb.bbclass index 9697426d5d..388f9819bd 100644 --- a/classes/package_deb.bbclass +++ b/classes/package_deb.bbclass @@ -138,7 +138,11 @@ python do_package_deb () { raise bb.build.FuncFailed("unable to open control file for writing.") fields = [] - fields.append(["Version: %s-%s\n", ['PV', 'PR']]) + pe = bb.data.getVar('PE', d, 1) + if pe and int(pe) > 0: + fields.append(["Version: %s:%s-%s\n", ['PE', 'PV', 'PR']]) + else: + fields.append(["Version: %s-%s\n", ['PV', 'PR']]) fields.append(["Description: %s\n", ['DESCRIPTION']]) fields.append(["Section: %s\n", ['SECTION']]) fields.append(["Priority: %s\n", ['PRIORITY']]) -- cgit v1.2.3 From d1406ee2bd3dcb5136d2d96daefd1e93505eaac6 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 29 Mar 2007 13:00:20 +0000 Subject: libx11-1.1.1: makekeys.diff is applied upstream --- packages/xorg-lib/libx11_1.1.1.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/xorg-lib/libx11_1.1.1.bb b/packages/xorg-lib/libx11_1.1.1.bb index 88225a8eb7..07e0286a13 100644 --- a/packages/xorg-lib/libx11_1.1.1.bb +++ b/packages/xorg-lib/libx11_1.1.1.bb @@ -2,7 +2,6 @@ require xorg-lib-common.inc PE = "1" DESCRIPTION = "Base X libs." -SRC_URI += "file://makekeys.diff;patch=1" DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ libxcb libxdmcp xf86bigfontproto kbproto inputproto" -- cgit v1.2.3