Gentoo Archives: gentoo-commits

From: Aaron Bauman <bman@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-boot/silo/files/
Date: Thu, 05 Apr 2018 15:36:37
Message-Id: 1522942480.714b85c450678167c02f339d0d6990c0b50a74c8.bman@gentoo
1 commit: 714b85c450678167c02f339d0d6990c0b50a74c8
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Thu Apr 5 10:49:47 2018 +0000
4 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 5 15:34:40 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=714b85c4
7
8 sys-boot/silo: remove unused patch
9
10 Closes: https://github.com/gentoo/gentoo/pull/7826
11
12 sys-boot/silo/files/silo-e2fsprogs-1.4.14.patch | 54 -------------------------
13 1 file changed, 54 deletions(-)
14
15 diff --git a/sys-boot/silo/files/silo-e2fsprogs-1.4.14.patch b/sys-boot/silo/files/silo-e2fsprogs-1.4.14.patch
16 deleted file mode 100644
17 index afcfc462ea8..00000000000
18 --- a/sys-boot/silo/files/silo-e2fsprogs-1.4.14.patch
19 +++ /dev/null
20 @@ -1,54 +0,0 @@
21 -# Patch to make silo compile and work with >=e2fsprogs-1.4.14
22 -# http://bugs.gentoo.org/show_bug.cgi?id=350677
23 -# http://marc.info/?l=linux-sparc&m=129468771631829&w=2
24 ---- silo.orig/common/malloc.c 2010-02-28 12:11:51.000000000 +0100
25 -+++ silo/common/malloc.c 2011-01-22 12:06:42.849946213 +0100
26 -@@ -27,6 +27,12 @@
27 -
28 - static char *last_alloc = 0;
29 -
30 -+static char *align_ptr_to(char *ptr, unsigned long align)
31 -+{
32 -+ return (char *) ((((unsigned long) ptr) + (align - 1UL)) &
33 -+ ~(align - 1UL));
34 -+}
35 -+
36 - void *malloc (int size)
37 - {
38 - char *caddr;
39 -@@ -34,10 +40,34 @@
40 - caddr = malloc_ptr;
41 - malloc_ptr += size;
42 - last_alloc = caddr;
43 -- malloc_ptr = (char *) ((((unsigned long) malloc_ptr) + 7) & (~7));
44 -+ malloc_ptr = align_ptr_to(malloc_ptr, 8UL);
45 - return caddr;
46 - }
47 -
48 -+int posix_memalign(void **memptr, unsigned long alignment, unsigned long size)
49 -+{
50 -+ char *caddr;
51 -+
52 -+ if (alignment & (alignment - 1UL))
53 -+ return -1;
54 -+ if (alignment & (sizeof(void *) - 1UL))
55 -+ return -1;
56 -+
57 -+ if (size == 0) {
58 -+ *memptr = (void *) 0;
59 -+ return 0;
60 -+ }
61 -+
62 -+ caddr = align_ptr_to(malloc_ptr, alignment);
63 -+ malloc_ptr = (caddr + size);
64 -+ last_alloc = caddr;
65 -+ malloc_ptr = align_ptr_to(malloc_ptr, 8UL);
66 -+
67 -+ *memptr = caddr;
68 -+
69 -+ return 0;
70 -+}
71 -+
72 - void free (void *m)
73 - {
74 - if (m == last_alloc)