diff options
author | root <root@rshg054.dnsready.net> | 2012-04-17 00:01:34 +0000 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2012-04-17 00:01:34 +0000 |
commit | d1bfef207c6695736de171fc604b68eab0c1f1cd (patch) | |
tree | aead3dfb062624c07d4ce9b8d1d05255eb9f4ec3 /libre | |
parent | ea3d877b99c32e3a9e00ab220440d4518430e5bc (diff) |
Tue Apr 17 00:01:34 UTC 2012
Diffstat (limited to 'libre')
-rw-r--r-- | libre/linux-libre-api-headers/PKGBUILD | 21 | ||||
-rw-r--r-- | libre/linux-libre-lts/.directory | 2 | ||||
-rw-r--r-- | libre/linux-libre-lts/PKGBUILD | 4 | ||||
-rw-r--r-- | libre/linux-libre-lts/linux-libre-lts.install | 2 | ||||
-rw-r--r-- | libre/python2-libre/13156-revert-tls-changeset-subinterpreter.patch | 61 |
5 files changed, 78 insertions, 12 deletions
diff --git a/libre/linux-libre-api-headers/PKGBUILD b/libre/linux-libre-api-headers/PKGBUILD index 0a449ef3e..72f4c464d 100644 --- a/libre/linux-libre-api-headers/PKGBUILD +++ b/libre/linux-libre-api-headers/PKGBUILD @@ -5,8 +5,9 @@ # toolchain build order: linux-libre-api-headers->glibc->binutils->gcc->binutils->glibc pkgname=linux-libre-api-headers -pkgver=3.3 -_basever=3.3 +_basekernel=3.3 +_sublevel=2 +pkgver=${_basekernel}.${_sublevel} pkgrel=1 pkgdesc="Kernel Libre headers sanitized for use in userspace" arch=('i686' 'x86_64' 'mips64el') @@ -15,20 +16,24 @@ license=('GPL2') provides=("linux-api-headers=${pkgver}" "kernel-headers=${pkgver}") conflicts=('linux-api-headers' 'kernel-headers') replaces=('linux-api-headers' 'kernel-headers') -source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basever}-gnu/linux-libre-${_basever}-gnu.tar.xz") - #"http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basever}-gnu-${pkgver}-gnu.xz") -md5sums=('5487da14ca81715a469c7594d39722fa') +source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz" + "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz") +md5sums=('5487da14ca81715a469c7594d39722fa' + 'b43d3bdecfa355bf45bd1154819e3687') build() { - cd ${srcdir}/linux-${_basever} - [[ $pkgver != $_basever ]] && patch -Np1 -i ${srcdir}/patch-${_basever}-gnu-${pkgver}-gnu + cd ${srcdir}/linux-${_basekernel} + + if [ "${_basekernel}" != "${pkgver}" ]; then + patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu" + fi make mrproper make headers_check } package() { - cd ${srcdir}/linux-${_basever} + cd ${srcdir}/linux-${_basekernel} make INSTALL_HDR_PATH=${pkgdir}/usr headers_install # use headers from libdrm diff --git a/libre/linux-libre-lts/.directory b/libre/linux-libre-lts/.directory index 60156bc93..89e875be9 100644 --- a/libre/linux-libre-lts/.directory +++ b/libre/linux-libre-lts/.directory @@ -1,2 +1,2 @@ [Dolphin] -Timestamp=2012,3,15,16,10,14 +Timestamp=2012,4,16,17,55,34 diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 790ea5e0b..5fe592460 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -9,7 +9,7 @@ pkgname=('linux-libre-lts' 'linux-libre-lts-headers') # Build stock -LIBRE kerne # pkgname=linux-custom # Build kernel with a different name _kernelname=-LIBRE-LTS _basekernel=3.0 -_sublevel=27 +_sublevel=28 pkgver=${_basekernel}.${_sublevel} _lxopkgver=${_basekernel}.26 # nearly always the same as pkgver pkgrel=1 @@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'ext4-options.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('5f64180fe7df4e574dac5911b78f5067' - '365d490f97b1960c8880eb22257d5ef0' + '150cef79eaa9a41cd5ccd65c696e7f10' 'c7acde811ca6808b294dc06480048c61' '792766d6d403cc967977f6a46aa95d1d' 'd2c0701480bce49fd4b40dc46b9863f1' diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index acb2b71f5..5f32392c0 100644 --- a/libre/linux-libre-lts/linux-libre-lts.install +++ b/libre/linux-libre-lts/linux-libre-lts.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts -KERNEL_VERSION=3.0.27-1-LIBRE-LTS +KERNEL_VERSION=3.0.28-1-LIBRE-LTS post_install () { # updating module dependencies diff --git a/libre/python2-libre/13156-revert-tls-changeset-subinterpreter.patch b/libre/python2-libre/13156-revert-tls-changeset-subinterpreter.patch new file mode 100644 index 000000000..ed8154df5 --- /dev/null +++ b/libre/python2-libre/13156-revert-tls-changeset-subinterpreter.patch @@ -0,0 +1,61 @@ + +# HG changeset patch +# User Charles-François Natali <neologix@free.fr> +# Date 1318446474 -7200 +# Node ID ee4fe16d9b4822457ad855ea6c44e65030166304 +# Parent f6feed6ec3f9b024cecd0fd587595c403f55624f +Issue #13156: revert changeset f6feed6ec3f9, which was only relevant for native +TLS implementations, and fails with the ad-hoc TLS implementation when a thread +doesn't have an auto thread state (e.g. a thread created outside of Python +calling into a subinterpreter). + +diff --git a/Include/pystate.h b/Include/pystate.h +--- a/Include/pystate.h ++++ b/Include/pystate.h +@@ -111,7 +111,6 @@ PyAPI_FUNC(void) PyThreadState_Clear(PyT + PyAPI_FUNC(void) PyThreadState_Delete(PyThreadState *); + #ifdef WITH_THREAD + PyAPI_FUNC(void) PyThreadState_DeleteCurrent(void); +-PyAPI_FUNC(void) _PyGILState_Reinit(void); + #endif + + PyAPI_FUNC(PyThreadState *) PyThreadState_Get(void); +diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c +--- a/Modules/signalmodule.c ++++ b/Modules/signalmodule.c +@@ -976,7 +976,6 @@ void + PyOS_AfterFork(void) + { + #ifdef WITH_THREAD +- _PyGILState_Reinit(); + PyEval_ReInitThreads(); + main_thread = PyThread_get_thread_ident(); + main_pid = getpid(); +diff --git a/Python/pystate.c b/Python/pystate.c +--- a/Python/pystate.c ++++ b/Python/pystate.c +@@ -537,23 +537,6 @@ void + autoInterpreterState = NULL; + } + +-/* Reset the TLS key - called by PyOS_AfterFork. +- * This should not be necessary, but some - buggy - pthread implementations +- * don't flush TLS on fork, see issue #10517. +- */ +-void +-_PyGILState_Reinit(void) +-{ +- PyThreadState *tstate = PyGILState_GetThisThreadState(); +- PyThread_delete_key(autoTLSkey); +- if ((autoTLSkey = PyThread_create_key()) == -1) +- Py_FatalError("Could not allocate TLS entry"); +- +- /* re-associate the current thread state with the new key */ +- if (PyThread_set_key_value(autoTLSkey, (void *)tstate) < 0) +- Py_FatalError("Couldn't create autoTLSkey mapping"); +-} +- + /* When a thread state is created for a thread by some mechanism other than + PyGILState_Ensure, it's important that the GILState machinery knows about + it so it doesn't try to create another thread state for the thread (this is + |