diff options
author | root <root@rshg054.dnsready.net> | 2012-09-22 00:17:51 -0700 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2012-09-22 00:17:51 -0700 |
commit | 0297e16d6d46f426939811847e72539d15bbf12d (patch) | |
tree | 9f8fb2c593c67b3ae01861328bcff9369f11c17c /testing/systemd | |
parent | 7bcc3e9d12b9294024067ecaf8ab28a9fe83ab6c (diff) |
Sat Sep 22 00:17:51 PDT 2012
Diffstat (limited to 'testing/systemd')
-rw-r--r-- | testing/systemd/0001-journal-bring-mmap-cache-prototype-in-sync.patch | 24 | ||||
-rw-r--r-- | testing/systemd/PKGBUILD | 26 | ||||
-rw-r--r-- | testing/systemd/use-split-usr-path.patch | 10 |
3 files changed, 48 insertions, 12 deletions
diff --git a/testing/systemd/0001-journal-bring-mmap-cache-prototype-in-sync.patch b/testing/systemd/0001-journal-bring-mmap-cache-prototype-in-sync.patch new file mode 100644 index 000000000..c92cf5d11 --- /dev/null +++ b/testing/systemd/0001-journal-bring-mmap-cache-prototype-in-sync.patch @@ -0,0 +1,24 @@ +From e2c8b07dcb50c2adf64cdfb22e4a496fc76576fb Mon Sep 17 00:00:00 2001 +From: Lennart Poettering <lennart@poettering.net> +Date: Sat, 22 Sep 2012 00:16:13 +0200 +Subject: [PATCH] journal: bring mmap cache prototype in sync + +--- + src/journal/mmap-cache.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/journal/mmap-cache.h b/src/journal/mmap-cache.h +index de34634..0c42fb8 100644 +--- a/src/journal/mmap-cache.h ++++ b/src/journal/mmap-cache.h +@@ -31,6 +31,6 @@ MMapCache* mmap_cache_new(void); + MMapCache* mmap_cache_ref(MMapCache *m); + MMapCache* mmap_cache_unref(MMapCache *m); + +-int mmap_cache_get(MMapCache *m, int fd, int prot, unsigned context, bool keep_always, uint64_t offset, uint64_t size, struct stat *st, void **ret); ++int mmap_cache_get(MMapCache *m, int fd, int prot, unsigned context, bool keep_always, uint64_t offset, size_t size, struct stat *st, void **ret); + void mmap_cache_close_fd(MMapCache *m, int fd); + void mmap_cache_close_context(MMapCache *m, unsigned context); +-- +1.7.12.1 + diff --git a/testing/systemd/PKGBUILD b/testing/systemd/PKGBUILD index 29479db75..9c6023a44 100644 --- a/testing/systemd/PKGBUILD +++ b/testing/systemd/PKGBUILD @@ -3,27 +3,29 @@ pkgbase=systemd pkgname=('systemd' 'systemd-sysvcompat') -pkgver=189 -pkgrel=4 +pkgver=191 +pkgrel=1 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2' 'LGPL2.1' 'MIT') makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection' 'gperf' 'gtk-doc' 'intltool' 'kmod' 'libcap' 'libgcrypt' 'libxslt' 'linux-api-headers' - 'pam' 'xz') + 'pam' 'quota-tools' 'xz') options=('!libtool') source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" 'initcpio-hook-udev' 'initcpio-install-udev' 'initcpio-install-timestamp' '0001-Reinstate-TIMEOUT-handling.patch' + '0001-journal-bring-mmap-cache-prototype-in-sync.patch' 'use-split-usr-path.patch') -md5sums=('ac2eb313f5dce79622f60aac56bca66d' +md5sums=('a5e4bfaf900a9e2480827feaf58556cb' 'e99e9189aa2f6084ac28b8ddf605aeb8' '59e91c4d7a69b7bf12c86a9982e37ced' 'df69615503ad293c9ddf9d8b7755282d' '5543be25f205f853a21fa5ee68e03f0d' - '482dba45a783f06c2239f1355f4ce72f') + 'ab42d779d640c6f986f48d326b7f0555' + 'fd5b5f04ab0a847373d357555129d4c0') build() { cd "$pkgname-$pkgver" @@ -34,6 +36,10 @@ build() { # hang onto this until we do the /{,s}bin merge patch -Np1 <"$srcdir/use-split-usr-path.patch" + # i686 build fail + # upstream commit: e2c8b07dcb50c2adf64cdfb22e4a496fc76576fb + patch -Np1 <"$srcdir/0001-journal-bring-mmap-cache-prototype-in-sync.patch" + ./configure \ --libexecdir=/usr/lib \ --localstatedir=/var \ @@ -60,7 +66,8 @@ package_systemd() { 'python2-cairo: systemd-analyze' 'python2-dbus: systemd-analyze' 'systemd-sysvcompat: symlink package to provide sysvinit binaries' - 'cryptsetup: required for encrypted block devices') + 'cryptsetup: required for encrypted block devices' + 'quota-tools: kernel-level quota management') backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf etc/dbus-1/system.d/org.freedesktop.hostname1.conf etc/dbus-1/system.d/org.freedesktop.login1.conf @@ -130,9 +137,14 @@ package_systemd() { package_systemd-sysvcompat() { pkgdesc="sysvinit compat for systemd" - conflicts=('sysvinit') + conflicts=('sysvinit' 'initscripts') depends=('sysvinit-tools') + # the initscripts conflict here isn't actually needed, but in order to make + # this package remove both sysvinit and initscripts, the initscripts conflict + # is needed. There's no case in which you would ever want initscripts installed + # without sysvinit, and vice versa, as in both cases, they are unusable. + mv "$srcdir/_sysvcompat"/* "$pkgdir" install -dm755 "$pkgdir/sbin" diff --git a/testing/systemd/use-split-usr-path.patch b/testing/systemd/use-split-usr-path.patch index 057045bf1..2fd32998d 100644 --- a/testing/systemd/use-split-usr-path.patch +++ b/testing/systemd/use-split-usr-path.patch @@ -1,6 +1,6 @@ ---- a/src/core/main.c 2012-07-17 19:46:24.000000000 -0400 -+++ b/src/core/main.c 2012-07-27 10:04:13.000000000 -0400 -@@ -1379,11 +1379,7 @@ +--- a/src/core/main.c 2012-09-20 23:02:54.000000000 -0400 ++++ b/src/core/main.c 2012-09-20 23:03:13.000000000 -0400 +@@ -1455,11 +1455,7 @@ /* Set up PATH unless it is already set */ setenv("PATH", @@ -9,6 +9,6 @@ -#else - "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin", -#endif - arg_running_as == MANAGER_SYSTEM); + arg_running_as == SYSTEMD_SYSTEM); - if (arg_running_as == MANAGER_SYSTEM) { + if (arg_running_as == SYSTEMD_SYSTEM) { |