From 6b480b66f648b23b9d6e9a4b75a46b815e31a185 Mon Sep 17 00:00:00 2001
From: Max Krummenacher <max.krummenacher@toradex.com>
Date: Thu, 5 Mar 2015 09:55:29 +0100
Subject: journald: remove journald.conf patch

meta-angstrom now overrides the effect of the patch and provides the
journald.conffile in full.

To override a setting either create the file with your settings in
meta-toradex/recipes-core/systemd/systemd/journald.conf or
edit meta-angstrom/recipes-core/systemd/systemd/journald.conf.
---
 recipes-core/systemd/systemd/journald-conf.patch | 13 -------------
 recipes-core/systemd/systemd_%.bbappend          |  5 -----
 2 files changed, 18 deletions(-)
 delete mode 100644 recipes-core/systemd/systemd/journald-conf.patch
 delete mode 100644 recipes-core/systemd/systemd_%.bbappend

(limited to 'recipes-core')

diff --git a/recipes-core/systemd/systemd/journald-conf.patch b/recipes-core/systemd/systemd/journald-conf.patch
deleted file mode 100644
index d5777e0..0000000
--- a/recipes-core/systemd/systemd/journald-conf.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- systemd-206/src/journal/journald.conf~	2013-07-22 00:43:28.000000000 +0200
-+++ systemd-206/src/journal/journald.conf	2014-01-24 14:46:31.062603121 +0100
-@@ -15,8 +15,8 @@
- #SyncIntervalSec=5m
- #RateLimitInterval=30s
- #RateLimitBurst=1000
--#SystemMaxUse=
--#SystemKeepFree=
-+SystemMaxUse=10M
-+SystemKeepFree=30M
- #SystemMaxFileSize=
- #RuntimeMaxUse=
- #RuntimeKeepFree=
diff --git a/recipes-core/systemd/systemd_%.bbappend b/recipes-core/systemd/systemd_%.bbappend
deleted file mode 100644
index c099bda..0000000
--- a/recipes-core/systemd/systemd_%.bbappend
+++ /dev/null
@@ -1,5 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += " \
-    file://journald-conf.patch \
-"
-- 
cgit v1.2.3