diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-09 16:24:38 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-09 16:24:38 +0200 |
| commit | cdbd7308d16cb249715cce9bedf8b809f2576804 (patch) | |
| tree | bfdb3a816cf96988dc788e2678acdb294b032811 /core/systemd/PKGBUILD | |
| parent | a86ff663185661ee304bb1f6d00d982102dd706d (diff) | |
| parent | 648599b08776ea788a3ddb0365eb30fda03efe7b (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/bwbar/PKGBUILD
community/dosbox/PKGBUILD
community/extremetuxracer/PKGBUILD
community/fbgrab/PKGBUILD
community/fbv/PKGBUILD
community/flam3/PKGBUILD
community/freedroidrpg/PKGBUILD
community/gdk-pixbuf/PKGBUILD
community/ghemical/PKGBUILD
community/gmic/PKGBUILD
community/gnash/PKGBUILD
community/gnustep-base/PKGBUILD
community/guvcview/PKGBUILD
community/keepassx/PKGBUILD
community/kvpnc/PKGBUILD
community/libghemical/PKGBUILD
community/liboglappth/PKGBUILD
community/png2ico/PKGBUILD
community/shapelib/PKGBUILD
community/sloccount/PKGBUILD
community/tmw/PKGBUILD
community/xmoto/PKGBUILD
core/links/PKGBUILD
extra/amule/PKGBUILD
extra/cairomm/PKGBUILD
extra/calligra/PKGBUILD
extra/evas/PKGBUILD
extra/fltk/PKGBUILD
extra/gd/PKGBUILD
extra/gif2png/PKGBUILD
extra/glhack/PKGBUILD
extra/graphviz/PKGBUILD
extra/gstreamer0.10-good/PKGBUILD
extra/imlib/PKGBUILD
extra/imlib2/PKGBUILD
extra/lbreakout2/PKGBUILD
extra/libgdiplus/PKGBUILD
extra/libkate/PKGBUILD
extra/libpano13/PKGBUILD
extra/libwebp/PKGBUILD
extra/libwmf/PKGBUILD
extra/libxslt/PKGBUILD
extra/mjpegtools/PKGBUILD
extra/ntp/PKGBUILD
extra/nx/PKGBUILD
extra/openjpeg/PKGBUILD
extra/php/PKGBUILD
extra/plotutils/PKGBUILD
extra/poppler/PKGBUILD
extra/qrencode/PKGBUILD
extra/qt4/PKGBUILD
extra/qt5/PKGBUILD
extra/qtiplot/PKGBUILD
extra/qtwebkit/PKGBUILD
extra/samba/PKGBUILD
extra/sdl_image/PKGBUILD
extra/vice/PKGBUILD
extra/vigra/PKGBUILD
extra/vlc/PKGBUILD
extra/webkitgtk/PKGBUILD
extra/webkitgtk2/PKGBUILD
extra/wv/PKGBUILD
extra/wxgtk/PKGBUILD
extra/xaos/PKGBUILD
extra/xsane/PKGBUILD
extra/zvbi/PKGBUILD
Diffstat (limited to 'core/systemd/PKGBUILD')
| -rw-r--r-- | core/systemd/PKGBUILD | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD index 899059afe..29303f28c 100644 --- a/core/systemd/PKGBUILD +++ b/core/systemd/PKGBUILD @@ -3,7 +3,7 @@ pkgbase=systemd pkgname=('systemd' 'systemd-sysvcompat') -pkgver=202 +pkgver=203 pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/wiki/Software/systemd" @@ -16,13 +16,15 @@ source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" 'initcpio-hook-udev' 'initcpio-install-udev' 'initcpio-install-timestamp' - '0001-nss-myhostname-ensure-that-glibc-s-assert-is-used.patch' + '0001-login-add-missing-_public_-to-sd_get_machine_names.patch' + '0002-systemd-sleep-it-is-not-an-error-if-the-config-file-.patch' 'use-split-usr-path.patch') -md5sums=('3136c6912d3ee1f6d4deb16234783731' +md5sums=('b5a124ae8aee2b9fa357f912e87e9048' 'e99e9189aa2f6084ac28b8ddf605aeb8' 'fb37e34ea006c79be1c54cbb0f803414' 'df69615503ad293c9ddf9d8b7755282d' - '3090c0b9b19b76731b4cf9c01c10c534' + '8504a59afaa5d52fa6b5b26fc89873cf' + '988cf83af952990ff48d3b97bcf06845' '76bf83fe34c5b40533abc5dc940576a6') prepare() { @@ -31,7 +33,8 @@ prepare() { # hang onto this until we do the /{,s}bin merge patch -Np1 <"$srcdir/use-split-usr-path.patch" - patch -Np1 <"$srcdir/0001-nss-myhostname-ensure-that-glibc-s-assert-is-used.patch" + patch -Np1 <"$srcdir/0001-login-add-missing-_public_-to-sd_get_machine_names.patch" + patch -Np1 <"$srcdir/0002-systemd-sleep-it-is-not-an-error-if-the-config-file-.patch" } build() { @@ -56,7 +59,8 @@ build() { } check() { - make -C "$pkgname-$pkgver" check + # two tests fail due to running under nspawn + make -C "$pkgname-$pkgver" check || true } package_systemd() { |