From b6ed8da659ceb717f5f095d1a61685ffcbe4c27b Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Thu, 19 Nov 2015 23:27:02 -0800 Subject: [PATCH] systemd: update to version 228 --- packages/sysutils/systemd/package.mk | 2 +- .../systemd-01_journald-decrease-limits.patch | 31 ------------------- .../systemd-09_dont_support_btrfs.patch | 25 +++++++++++++++ 3 files changed, 26 insertions(+), 32 deletions(-) delete mode 100644 packages/sysutils/systemd/patches/systemd-01_journald-decrease-limits.patch create mode 100644 packages/sysutils/systemd/patches/systemd-09_dont_support_btrfs.patch diff --git a/packages/sysutils/systemd/package.mk b/packages/sysutils/systemd/package.mk index 136369ccde..e3fb7d634e 100644 --- a/packages/sysutils/systemd/package.mk +++ b/packages/sysutils/systemd/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="systemd" -PKG_VERSION="227" +PKG_VERSION="228" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/sysutils/systemd/patches/systemd-01_journald-decrease-limits.patch b/packages/sysutils/systemd/patches/systemd-01_journald-decrease-limits.patch deleted file mode 100644 index 7102c2f092..0000000000 --- a/packages/sysutils/systemd/patches/systemd-01_journald-decrease-limits.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 04a046cf97b89410e9630b7dcf48e302c7f3276a Mon Sep 17 00:00:00 2001 -From: Stefan Saraev -Date: Sat, 30 Nov 2013 13:16:37 +0200 -Subject: [PATCH 1/8] journald: decrease limits - -happy rpi users... ---- - src/journal/journal-file.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c -index 2845e05..e69918f 100644 ---- a/src/journal/journal-file.c -+++ b/src/journal/journal-file.c -@@ -42,11 +42,11 @@ - #define COMPRESSION_SIZE_THRESHOLD (512ULL) - - /* This is the minimum journal file size */ --#define JOURNAL_FILE_SIZE_MIN (4ULL*1024ULL*1024ULL) /* 4 MiB */ -+#define JOURNAL_FILE_SIZE_MIN (128ULL*1024ULL) /* 128 K */ - - /* These are the lower and upper bounds if we deduce the max_use value - * from the file system size */ --#define DEFAULT_MAX_USE_LOWER (1ULL*1024ULL*1024ULL) /* 1 MiB */ -+#define DEFAULT_MAX_USE_LOWER (512ULL*1024ULL) /* 512 K */ - #define DEFAULT_MAX_USE_UPPER (4ULL*1024ULL*1024ULL*1024ULL) /* 4 GiB */ - - /* This is the upper bound if we deduce max_size from max_use */ --- -1.7.10.4 - diff --git a/packages/sysutils/systemd/patches/systemd-09_dont_support_btrfs.patch b/packages/sysutils/systemd/patches/systemd-09_dont_support_btrfs.patch new file mode 100644 index 0000000000..ac89ff4845 --- /dev/null +++ b/packages/sysutils/systemd/patches/systemd-09_dont_support_btrfs.patch @@ -0,0 +1,25 @@ +From 0c50b670dc1466ce697a72b34cbb7a1a41d1b24f Mon Sep 17 00:00:00 2001 +From: Stefan Saraev +Date: Wed, 18 Nov 2015 20:15:43 +0200 +Subject: [PATCH 8/8] unsupported btrfs bull**** + +--- + src/basic/btrfs-util.c | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/src/basic/btrfs-util.c b/src/basic/btrfs-util.c +index be40dc5..e5efe4f 100644 +--- a/src/basic/btrfs-util.c ++++ b/src/basic/btrfs-util.c +@@ -1103,9 +1103,6 @@ int btrfs_quota_scan_start(int fd) { + int btrfs_quota_scan_wait(int fd) { + assert(fd >= 0); + +- if (ioctl(fd, BTRFS_IOC_QUOTA_RESCAN_WAIT) < 0) +- return -errno; +- + return 0; + } + +-- +2.1.4