summaryrefslogtreecommitdiffstats
path: root/meta-moblin/packages/sreadahead
diff options
context:
space:
mode:
Diffstat (limited to 'meta-moblin/packages/sreadahead')
-rwxr-xr-xmeta-moblin/packages/sreadahead/files/sreadahead-generate.sh21
-rwxr-xr-xmeta-moblin/packages/sreadahead/files/sreadahead.sh7
-rw-r--r--meta-moblin/packages/sreadahead/sreadahead-0.02/readahead_c.patch29
-rw-r--r--meta-moblin/packages/sreadahead/sreadahead-0.02/set_to_idle.patch39
-rw-r--r--meta-moblin/packages/sreadahead/sreadahead-0.02/sreadahead-0.02-make.patch27
-rw-r--r--meta-moblin/packages/sreadahead/sreadahead_0.02.bb48
6 files changed, 0 insertions, 171 deletions
diff --git a/meta-moblin/packages/sreadahead/files/sreadahead-generate.sh b/meta-moblin/packages/sreadahead/files/sreadahead-generate.sh
deleted file mode 100755
index 19438f2935..0000000000
--- a/meta-moblin/packages/sreadahead/files/sreadahead-generate.sh
+++ /dev/null
@@ -1,21 +0,0 @@
1#!/bin/sh
2#
3
4if [ -e /etc/readahead.packed ]; then
5 exit 0
6fi
7
8if [ -e /etc/readahead.packed.first ]; then
9 mv /etc/readahead.packed.first /etc/readahead.packed.second
10 exit 0
11fi
12
13# That's our second boot, we can generate the sreadahead file list
14if [ -e /etc/readahead.packed.second ]; then
15 rm -f /etc/readahead.packed.second
16 find / -type f | grep -E -v "\/dev\/|\/proc\/|\/sys\/" > filelist.txt
17
18 /sbin/generate_filelist filelist.txt
19 rm filelist.txt
20 mv readahead.packed /etc/
21fi
diff --git a/meta-moblin/packages/sreadahead/files/sreadahead.sh b/meta-moblin/packages/sreadahead/files/sreadahead.sh
deleted file mode 100755
index c7378284b2..0000000000
--- a/meta-moblin/packages/sreadahead/files/sreadahead.sh
+++ /dev/null
@@ -1,7 +0,0 @@
1#!/bin/sh
2#
3# Start sreadahead, of the config file exists
4
5if [ -e /etc/readahead.packed ]; then
6 /sbin/sreadahead
7fi
diff --git a/meta-moblin/packages/sreadahead/sreadahead-0.02/readahead_c.patch b/meta-moblin/packages/sreadahead/sreadahead-0.02/readahead_c.patch
deleted file mode 100644
index a65c1088f5..0000000000
--- a/meta-moblin/packages/sreadahead/sreadahead-0.02/readahead_c.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1---
2 readahead.c | 7 +++++--
3 1 file changed, 5 insertions(+), 2 deletions(-)
4
5Index: sreadahead-0.02/readahead.c
6===================================================================
7--- sreadahead-0.02.orig/readahead.c 2008-09-23 22:35:20.000000000 +0200
8+++ sreadahead-0.02/readahead.c 2008-10-27 16:27:52.000000000 +0100
9@@ -69,7 +69,11 @@ void *one_thread(void *ptr)
10 int main(int argc, char **argv)
11 {
12 FILE *file = fopen("/etc/readahead.packed", "r");
13-
14+ if (!file) {
15+ perror("Couldnt open /etc/readahead.packed");
16+ return -errno;
17+ }
18+
19 daemon(0,0);
20
21 total_files = fread(&files, sizeof(struct readahead), MAXR, file);
22@@ -81,7 +85,6 @@ int main(int argc, char **argv)
23 pthread_create(&three, NULL, one_thread, NULL);
24 pthread_create(&four, NULL, one_thread, NULL);
25
26- printf("Waiting\n");
27 pthread_join(one, NULL);
28 pthread_join(two, NULL);
29 pthread_join(three, NULL);
diff --git a/meta-moblin/packages/sreadahead/sreadahead-0.02/set_to_idle.patch b/meta-moblin/packages/sreadahead/sreadahead-0.02/set_to_idle.patch
deleted file mode 100644
index b48659048a..0000000000
--- a/meta-moblin/packages/sreadahead/sreadahead-0.02/set_to_idle.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1diff -Naurp sreadahead-0.02/readahead.c sreadahead-0.02-nice/readahead.c
2--- sreadahead-0.02/readahead.c 2008-11-06 00:57:17.000000000 -0500
3+++ sreadahead-0.02-nice/readahead.c 2008-11-06 02:28:29.000000000 -0500
4@@ -26,7 +26,18 @@
5 #include <errno.h>
6
7 #include "readahead.h"
8+#include <sys/syscall.h>
9
10+# if defined(__i386__)
11+# define __NR_ioprio_set 289
12+# elif defined(__x86_64__)
13+# define __NR_ioprio_set 251
14+# else
15+# error "Unsupported arch"
16+# endif
17+
18+#define IOPRIO_WHO_PROCESS 1
19+#define IOPRIO_CLASS_SHIFT 13
20 #define MAXR 1024
21 static struct readahead files[MAXR];
22 static unsigned int total_files = 0;
23@@ -68,7 +79,15 @@ void *one_thread(void *ptr)
24
25 int main(int argc, char **argv)
26 {
27- FILE *file = fopen("/etc/readahead.packed", "r");
28+ int iopriority = 7; /* hard code for idle */
29+ int iopriority_class = 3; /* 3 stands for idle */
30+ int pid = 0;
31+ FILE *file;
32+
33+ if (syscall(__NR_ioprio_set, IOPRIO_WHO_PROCESS, pid, iopriority | iopriority_class << IOPRIO_CLASS_SHIFT) == -1)
34+ perror("Can not set priority to idle class");
35+
36+ file = fopen("/etc/readahead.packed", "r");
37 if (!file) {
38 perror("Couldnt open /etc/readahead.packed");
39 return -errno;
diff --git a/meta-moblin/packages/sreadahead/sreadahead-0.02/sreadahead-0.02-make.patch b/meta-moblin/packages/sreadahead/sreadahead-0.02/sreadahead-0.02-make.patch
deleted file mode 100644
index d0ece663b5..0000000000
--- a/meta-moblin/packages/sreadahead/sreadahead-0.02/sreadahead-0.02-make.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1diff -Nrup sreadahead-0.02.orig/Makefile sreadahead-0.02/Makefile
2--- sreadahead-0.02.orig/Makefile 2008-09-23 22:36:24.000000000 +0200
3+++ sreadahead-0.02/Makefile 2008-09-26 07:43:19.000000000 +0200
4@@ -1,11 +1,18 @@
5-all: generate_filelist sreadahead
6+CFLAGS=-Os -g -Wall
7+PROGS=generate_filelist sreadahead
8+
9+all: $(PROGS)
10
11
12 generate_filelist: readahead.h filelist.c Makefile
13- gcc -Os -g -Wall -W filelist.c -o generate_filelist
14+ $(CC) $(CFLAGS) -W filelist.c -o generate_filelist
15
16 sreadahead: readahead.h readahead.c Makefile
17- gcc -Os -g -Wall -lpthread -W readahead.c -o sreadahead
18+ $(CC) $(CFLAGS) -lpthread -W readahead.c -o sreadahead
19
20 clean:
21- rm -f *~ sreadahead generate_filelist
22\ No newline at end of file
23+ rm -f *~ sreadahead generate_filelist
24+
25+install: all
26+ mkdir -p $(DESTDIR)/sbin
27+ install -p -m 755 $(PROGS) $(DESTDIR)/sbin
diff --git a/meta-moblin/packages/sreadahead/sreadahead_0.02.bb b/meta-moblin/packages/sreadahead/sreadahead_0.02.bb
deleted file mode 100644
index c29a1defed..0000000000
--- a/meta-moblin/packages/sreadahead/sreadahead_0.02.bb
+++ /dev/null
@@ -1,48 +0,0 @@
1DESCRIPTION = "Super readahead, part of the fastboot tool set."
2SECTION = "base"
3HOMEPAGE = "http://www.moblin.org"
4LICENSE = "GPLv2"
5PR = "r13"
6
7inherit update-rc.d
8
9SRC_URI = "http://www.moblin.org/sites/all/files/sreadahead-${PV}.tar.gz \
10 file://sreadahead-0.02-make.patch;patch=1 \
11 file://readahead_c.patch;patch=1 \
12 file://set_to_idle.patch;patch=1 \
13 file://sreadahead-generate.sh \
14 file://sreadahead.sh"
15
16CFLAGS_prepend = "-I ${S}/include "
17
18#
19# Not compatible on arm due to the use of __sync_fetch_and_add
20# Would need to use a pthread mutex on arm
21#
22COMPATIBLE_HOST = "(i.86).*-linux"
23
24PACKAGES += "${PN}-generate"
25FILES_${PN} = "${base_sbindir}/sreadahead ${sysconfdir}/init.d/sreadahead.sh"
26FILES_${PN}-generate = "${base_sbindir}/generate_filelist ${sysconfdir}/init.d/sreadahead-generate.sh"
27
28INITSCRIPT_PACKAGES = "${PN} ${PN}-generate"
29INITSCRIPT_NAME = "sreadahead.sh"
30INITSCRIPT_NAME_${PN}-generate = "sreadahead-generate.sh"
31INITSCRIPT_PARAMS = "start 00 S ."
32INITSCRIPT_PARAMS_${PN}-generate = "defaults 99"
33
34do_install() {
35 oe_runmake install DESTDIR=${D}
36 install -d ${D}${sysconfdir}/init.d
37 install -m 755 ${WORKDIR}/sreadahead.sh ${D}${sysconfdir}/init.d/
38 install -m 755 ${WORKDIR}/sreadahead-generate.sh ${D}${sysconfdir}/init.d/
39}
40
41pkg_postinst_${PN}-generate () {
42 # can't do this offline
43 if [ "x$D" != "x" ]; then
44 exit 1
45 fi
46
47 touch /etc/readahead.packed.first
48}