Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 76798 Details for
Bug 118395
Can't prepare rlocate module in kernel 2.6.15
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
rlocate-0.3.3-build.patch
rlocate-0.3.3-build.patch (text/plain), 4.00 KB, created by
Andreas Sundebo
on 2006-01-10 18:50:19 UTC
(
hide
)
Description:
rlocate-0.3.3-build.patch
Filename:
MIME Type:
Creator:
Andreas Sundebo
Created:
2006-01-10 18:50:19 UTC
Size:
4.00 KB
patch
obsolete
>--- Makefile.in.orig 2005-12-19 18:20:09.000000000 -0500 >+++ Makefile.in 2005-12-19 18:22:02.000000000 -0500 >@@ -196,7 +196,7 @@ > RLOCATE_DB = $(RLOCATE_DB_DIR)/$(rlocate).db > RLOCATE_DB_TMP = $(RLOCATE_DB_DIR)/$(rlocate).db.tmp > MODULE_CFG = $(RLOCATE_DB_DIR)/module.cfg >-RLOCATE_GRP = $(rlocate) >+RLOCATE_GRP =locate > RLOCATED_CMD = $(DESTDIR)$(sbindir)/$(rlocated) > AM_CPPFLAGS = -DRLOCATE_DB=\"$(RLOCATE_DB)\" \ > -DRLOCATE_DB_TMP=\"$(RLOCATE_DB_TMP)\" \ >@@ -207,7 +207,7 @@ > > rlocate_SOURCES = pidfile.h pidfile.c main.c link.c misc.c link.h \ > misc.h rlocate.h rlocate.c $(am__append_1) >-SUBDIRS = doc rlocate-daemon rlocate-module rlocate-scripts >+SUBDIRS = doc rlocate-daemon rlocate-scripts > EXTRA_DIST = rlocate.cron debian rlocate-scripts autogen.sh \ > contrib install-cron.sh.in ChangeLog.slocate > >@@ -704,17 +704,15 @@ > > install-exec-hook: > # if FREEBSD >-# -/usr/sbin/pw groupadd rlocate > # else >-# -/usr/sbin/groupadd rlocate > # endif > $(INSTALL) -d $(RLOCATE_DB_DIR) >- chown root:$(rlocate) $(DESTDIR)$(bindir)/$(rlocate) >- chown root:$(rlocate) $(RLOCATE_DB_DIR) >+ chown root:locate $(DESTDIR)$(bindir)/$(rlocate) >+ chown root:locate $(RLOCATE_DB_DIR) > chmod 2755 $(DESTDIR)$(bindir)/$(rlocate) > chmod 0750 $(RLOCATE_DB_DIR) >- -$(LN_S) -f $(DESTDIR)$(bindir)/$(rlocate) $(DESTDIR)$(bindir)/$(updatedb) >- -$(LN_S) -f $(DESTDIR)$(bindir)/$(rlocate) $(DESTDIR)$(bindir)/$(locate) >+ -$(LN_S) -f $(rlocate) $(DESTDIR)$(bindir)/$(updatedb) >+ -$(LN_S) -f $(rlocate) $(DESTDIR)$(bindir)/$(locate) > @CRON_TRUE@ $(mkinstalldirs) $(DESTDIR)/etc/cron.daily/ > @CRON_TRUE@ sed \ > @CRON_TRUE@ -e "s,@UPDATEDB@,$(bindir)/$(updatedb)," \ >--- rlocate-daemon/Makefile.in.orig 2005-12-19 18:20:09.000000000 -0500 >+++ rlocate-daemon/Makefile.in 2005-12-19 18:20:09.000000000 -0500 >@@ -168,7 +168,7 @@ > MODULE_CFG = $(RLOCATE_DB_DIR)/module.cfg > AM_CPPFLAGS = -DRLOCATE_DB=\"$(RLOCATE_DB)\" \ > -DMODULE_CFG=\"$(MODULE_CFG)\" \ >- -DRLOCATE_GRP=\"$(rlocate)\" >+ -DRLOCATE_GRP=\"locate\" > > rlocated_SOURCES = ../misc.h ../misc.c ../pidfile.h ../pidfile.c rlocated.c > AM_CFLAGS = -O2 -Wall >--- rlocate-scripts/Makefile.in.orig 2005-12-19 18:20:09.000000000 -0500 >+++ rlocate-scripts/Makefile.in 2005-12-19 18:20:09.000000000 -0500 >@@ -343,9 +343,7 @@ > rm $(srcdir)/rlocate-checkpoint.temp > > install-exec-hook: >-@FREEBSD_TRUE@ -/usr/sbin/pw groupadd $(rlocate) >-@FREEBSD_FALSE@ -/usr/sbin/groupadd $(rlocate) >- chown root:$(rlocate) $(DESTDIR)$(bindir)/rlocate-checkpoint >+ chown root:locate $(DESTDIR)$(bindir)/rlocate-checkpoint > chmod 2755 $(DESTDIR)$(bindir)/rlocate-checkpoint > > uninstall-hook: >--- rlocate-module/rlocate.c.orig 2006-01-11 02:54:55.066167720 +0100 >+++ rlocate-module/rlocate.c 2006-01-11 02:55:07.204322440 +0100 >@@ -60,6 +60,7 @@ > #else > static struct class *rlocate_class; > #endif >+static struct rw_semaphore namespace_sem; > > MODULE_AUTHOR("Rasto Levrinc"); > MODULE_DESCRIPTION("rlocate"); >@@ -680,7 +681,7 @@ > ret = PTR_ERR(rlocate_class); > goto no_simple_class; > } >- class_device_create(rlocate_class, MKDEV(Major, 0), NULL, >+ class_device_create(rlocate_class, NULL, MKDEV(Major, 0), NULL, > DEVICE_NAME); > // devfs > devfs_mk_cdev(MKDEV(Major, 0), S_IFCHR|S_IRUSR|S_IWUSR, DEVICE_NAME); >@@ -835,7 +836,7 @@ > } > return; > } >- down_read(&namespace->sem); >+ down_read(&namespace_sem); > list_for_each(head, &namespace->list) { > mnt = list_entry(head, struct vfsmount, mnt_list); > if (mnt->mnt_root == sb_root) { >@@ -848,7 +849,7 @@ > } > } > } >- up_read(&namespace->sem); >+ up_read(&namespace_sem); > dput(sb_root); > } > >@@ -930,6 +931,7 @@ > static int __init init_rlocate(void) > { > int ret; >+ init_rwsem(&namespace_sem); > printk(KERN_INFO "rlocate version "RL_VERSION"\n"); > //init_waitqueue_head (&filenames_wq); > // register dev
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 118395
:
76798
|
76800