From c0c657bd92911788b96d9670620eabf024453752 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 30 Sep 2010 22:15:13 +0100 Subject: Split meta-extras and meta-moblin out of the main repository Signed-off-by: Richard Purdie --- .../sreadahead/files/sreadahead-generate.sh | 21 ---------- .../packages/sreadahead/files/sreadahead.sh | 7 ---- .../sreadahead/sreadahead-0.02/readahead_c.patch | 29 ------------- .../sreadahead/sreadahead-0.02/set_to_idle.patch | 39 ------------------ .../sreadahead-0.02/sreadahead-0.02-make.patch | 27 ------------ meta-moblin/packages/sreadahead/sreadahead_0.02.bb | 48 ---------------------- 6 files changed, 171 deletions(-) delete mode 100755 meta-moblin/packages/sreadahead/files/sreadahead-generate.sh delete mode 100755 meta-moblin/packages/sreadahead/files/sreadahead.sh delete mode 100644 meta-moblin/packages/sreadahead/sreadahead-0.02/readahead_c.patch delete mode 100644 meta-moblin/packages/sreadahead/sreadahead-0.02/set_to_idle.patch delete mode 100644 meta-moblin/packages/sreadahead/sreadahead-0.02/sreadahead-0.02-make.patch delete mode 100644 meta-moblin/packages/sreadahead/sreadahead_0.02.bb (limited to 'meta-moblin/packages/sreadahead') 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 19438f293..000000000 --- a/meta-moblin/packages/sreadahead/files/sreadahead-generate.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh -# - -if [ -e /etc/readahead.packed ]; then - exit 0 -fi - -if [ -e /etc/readahead.packed.first ]; then - mv /etc/readahead.packed.first /etc/readahead.packed.second - exit 0 -fi - -# That's our second boot, we can generate the sreadahead file list -if [ -e /etc/readahead.packed.second ]; then - rm -f /etc/readahead.packed.second - find / -type f | grep -E -v "\/dev\/|\/proc\/|\/sys\/" > filelist.txt - - /sbin/generate_filelist filelist.txt - rm filelist.txt - mv readahead.packed /etc/ -fi diff --git a/meta-moblin/packages/sreadahead/files/sreadahead.sh b/meta-moblin/packages/sreadahead/files/sreadahead.sh deleted file mode 100755 index c7378284b..000000000 --- a/meta-moblin/packages/sreadahead/files/sreadahead.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -# -# Start sreadahead, of the config file exists - -if [ -e /etc/readahead.packed ]; then - /sbin/sreadahead -fi 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 a65c1088f..000000000 --- a/meta-moblin/packages/sreadahead/sreadahead-0.02/readahead_c.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- - readahead.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -Index: sreadahead-0.02/readahead.c -=================================================================== ---- sreadahead-0.02.orig/readahead.c 2008-09-23 22:35:20.000000000 +0200 -+++ sreadahead-0.02/readahead.c 2008-10-27 16:27:52.000000000 +0100 -@@ -69,7 +69,11 @@ void *one_thread(void *ptr) - int main(int argc, char **argv) - { - FILE *file = fopen("/etc/readahead.packed", "r"); -- -+ if (!file) { -+ perror("Couldnt open /etc/readahead.packed"); -+ return -errno; -+ } -+ - daemon(0,0); - - total_files = fread(&files, sizeof(struct readahead), MAXR, file); -@@ -81,7 +85,6 @@ int main(int argc, char **argv) - pthread_create(&three, NULL, one_thread, NULL); - pthread_create(&four, NULL, one_thread, NULL); - -- printf("Waiting\n"); - pthread_join(one, NULL); - pthread_join(two, NULL); - 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 b48659048..000000000 --- a/meta-moblin/packages/sreadahead/sreadahead-0.02/set_to_idle.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -Naurp sreadahead-0.02/readahead.c sreadahead-0.02-nice/readahead.c ---- sreadahead-0.02/readahead.c 2008-11-06 00:57:17.000000000 -0500 -+++ sreadahead-0.02-nice/readahead.c 2008-11-06 02:28:29.000000000 -0500 -@@ -26,7 +26,18 @@ - #include - - #include "readahead.h" -+#include - -+# if defined(__i386__) -+# define __NR_ioprio_set 289 -+# elif defined(__x86_64__) -+# define __NR_ioprio_set 251 -+# else -+# error "Unsupported arch" -+# endif -+ -+#define IOPRIO_WHO_PROCESS 1 -+#define IOPRIO_CLASS_SHIFT 13 - #define MAXR 1024 - static struct readahead files[MAXR]; - static unsigned int total_files = 0; -@@ -68,7 +79,15 @@ void *one_thread(void *ptr) - - int main(int argc, char **argv) - { -- FILE *file = fopen("/etc/readahead.packed", "r"); -+ int iopriority = 7; /* hard code for idle */ -+ int iopriority_class = 3; /* 3 stands for idle */ -+ int pid = 0; -+ FILE *file; -+ -+ if (syscall(__NR_ioprio_set, IOPRIO_WHO_PROCESS, pid, iopriority | iopriority_class << IOPRIO_CLASS_SHIFT) == -1) -+ perror("Can not set priority to idle class"); -+ -+ file = fopen("/etc/readahead.packed", "r"); - if (!file) { - perror("Couldnt open /etc/readahead.packed"); - 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 d0ece663b..000000000 --- a/meta-moblin/packages/sreadahead/sreadahead-0.02/sreadahead-0.02-make.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -Nrup sreadahead-0.02.orig/Makefile sreadahead-0.02/Makefile ---- sreadahead-0.02.orig/Makefile 2008-09-23 22:36:24.000000000 +0200 -+++ sreadahead-0.02/Makefile 2008-09-26 07:43:19.000000000 +0200 -@@ -1,11 +1,18 @@ --all: generate_filelist sreadahead -+CFLAGS=-Os -g -Wall -+PROGS=generate_filelist sreadahead -+ -+all: $(PROGS) - - - generate_filelist: readahead.h filelist.c Makefile -- gcc -Os -g -Wall -W filelist.c -o generate_filelist -+ $(CC) $(CFLAGS) -W filelist.c -o generate_filelist - - sreadahead: readahead.h readahead.c Makefile -- gcc -Os -g -Wall -lpthread -W readahead.c -o sreadahead -+ $(CC) $(CFLAGS) -lpthread -W readahead.c -o sreadahead - - clean: -- rm -f *~ sreadahead generate_filelist -\ No newline at end of file -+ rm -f *~ sreadahead generate_filelist -+ -+install: all -+ mkdir -p $(DESTDIR)/sbin -+ 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 c29a1defe..000000000 --- a/meta-moblin/packages/sreadahead/sreadahead_0.02.bb +++ /dev/null @@ -1,48 +0,0 @@ -DESCRIPTION = "Super readahead, part of the fastboot tool set." -SECTION = "base" -HOMEPAGE = "http://www.moblin.org" -LICENSE = "GPLv2" -PR = "r13" - -inherit update-rc.d - -SRC_URI = "http://www.moblin.org/sites/all/files/sreadahead-${PV}.tar.gz \ - file://sreadahead-0.02-make.patch;patch=1 \ - file://readahead_c.patch;patch=1 \ - file://set_to_idle.patch;patch=1 \ - file://sreadahead-generate.sh \ - file://sreadahead.sh" - -CFLAGS_prepend = "-I ${S}/include " - -# -# Not compatible on arm due to the use of __sync_fetch_and_add -# Would need to use a pthread mutex on arm -# -COMPATIBLE_HOST = "(i.86).*-linux" - -PACKAGES += "${PN}-generate" -FILES_${PN} = "${base_sbindir}/sreadahead ${sysconfdir}/init.d/sreadahead.sh" -FILES_${PN}-generate = "${base_sbindir}/generate_filelist ${sysconfdir}/init.d/sreadahead-generate.sh" - -INITSCRIPT_PACKAGES = "${PN} ${PN}-generate" -INITSCRIPT_NAME = "sreadahead.sh" -INITSCRIPT_NAME_${PN}-generate = "sreadahead-generate.sh" -INITSCRIPT_PARAMS = "start 00 S ." -INITSCRIPT_PARAMS_${PN}-generate = "defaults 99" - -do_install() { - oe_runmake install DESTDIR=${D} - install -d ${D}${sysconfdir}/init.d - install -m 755 ${WORKDIR}/sreadahead.sh ${D}${sysconfdir}/init.d/ - install -m 755 ${WORKDIR}/sreadahead-generate.sh ${D}${sysconfdir}/init.d/ -} - -pkg_postinst_${PN}-generate () { - # can't do this offline - if [ "x$D" != "x" ]; then - exit 1 - fi - - touch /etc/readahead.packed.first -} -- cgit v1.2.3