Changeset f8c5cfb in freewrt

Timestamp:

May 22, 2007, 4:33:47 PM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Children:

5e15178

Parents:

24ad068

Message:

annoying

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@2606 afb5a338-a214-0410-bd46-81f09a774fd1

Location:

package/procps/patches

Files:

• patch-Makefile (modified) (2 diffs)
• patch-proc_module_mk (modified) (2 diffs)
• patch-ps_module_mk (added)

package/procps/patches/patch-Makefile

@@ -1 +1 @@
 $FreeWRT$
-install as non-root
---- procps-3.2.7.orig/Makefile  2006-06-24 11:02:25.000000000 +0200
-+++ procps-3.2.7/Makefile       2006-12-13 15:51:09.000000000 +0100
+
+        install(1) doesn't have a -D option
+
+--- procps-3.2.7.orig/Makefile  Sat Jun 24 09:02:02 2006
++++ procps-3.2.7/Makefile       Tue May 22 14:28:43 2007
 @@ -27,7 +27,7 @@ TARVERSION   := $(VERSION).$(SUBVERSION)
  ldconfig := ldconfig
@@ -8 +10 @@
  ln_sf    := ln -sf
 -install  := install -D --owner 0 --group 0
-+install  := install -D
++install  := install
  
  # Lame x86-64 /lib64 and /usr/lib64 abomination:
  lib64    := lib$(shell [ -d /lib64 ] && echo 64)
+@@ -222,10 +222,16 @@ clean:
+ ###### install
+ 
+ $(BINFILES) : all
+-       $(install) --mode a=rx $(notdir $@) $@
++       mkdir -p $(dir $@)
++       for f in $@; do \
++               install -c -m 555 $$(basename $$f) $$f; \
++       done
+ 
+ $(MANFILES) : all
+-       $(install) --mode a=r $(notdir $@) $@
++       mkdir -p $(dir $@)
++       for f in $@; do \
++               install -c -m 444 $$(basename $$f) $$f; \
++       done
+ 
+ install: $(filter-out $(SKIP) $(addprefix $(DESTDIR),$(SKIP)),$(INSTALL))
+        cd $(usr/bin) && $(ln_f) skill snice

package/procps/patches/patch-proc_module_mk

@@ -1 +1 @@
 $FreeWRT$
 Build everything static
---- procps-3.2.7.orig/proc/module.mk    2004-09-23 15:10:42.000000000 +0200
-+++ procps-3.2.7/proc/module.mk 2006-12-13 16:08:35.000000000 +0100
+--- procps-3.2.7.orig/proc/module.mk    Thu Sep 23 13:10:20 2004
++++ procps-3.2.7/proc/module.mk Tue May 22 14:32:45 2007
 @@ -17,7 +17,7 @@
  # numbers for future use, the ELF soname can be set equal to the
@@ -12 +12 @@
  # for lib$(NAME).so and /usr/include/($NAME) and such
  NAME       :=  proc
+@@ -96,7 +96,8 @@ endif
+ #################### install rules ###########################
+ 
+ $(lib)$(SOFILE) : proc/$(SONAME)
+-       $(install) --mode a=rx $< $@
++       mkdir -p $(dir $@)
++       install -c -m 555 $< $@
+ 
+ ifneq ($(SOLINK),$(SOFILE))
+ .PHONY: $(lib)$(SOLINK)
+@@ -115,7 +116,8 @@ ldconfig : $(lib)$(SONAME) $(lib)$(SOLIN
+        $(ldconfig)
+ 
+ $(usr/lib)$(ANAME) : proc/$(ANAME)
+-       $(install) --mode a=r $< $@
++       mkdir -p $(dir $@)
++       install -c -m 444 $< $@
+ 
+ # Junk anyway... supposed to go in /usr/include/$(NAME)
+ #INSTALL += $(addprefix $(include),$(HDRFILES))