karasz
/
package-update
1
0
Fork 0
Code Issues Releases Activity
Browse Source

* updated embutils (0.17 -> 0.18) - close #253 

git-svn-id: svn://svn.opensde.net/opensde/package/trunk@20585 10447126-35f2-4685-b0cf-6dd780d3921f
early
Alejandro Mery 19 years ago
parent
b0d65deac0
commit
0646071e4e
10 changed files with 136 additions and 194 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 71
      base/embutils/build.patch
  2. 19
      base/embutils/embutils.conf
  3. 6
      base/embutils/embutils.desc
  4. 27
      base/embutils/free.patch
  5. 27
      base/embutils/losetup.patch
  6. 31
      base/embutils/no-shared.patch
  7. 63
      base/embutils/parallelism.patch
  8. 31
      base/embutils/which-wd.patch
  9. 27
      base/embutils/x-switch_root.patch
  10. 28
      base/embutils/xx-readlink.patch

71
base/embutils/build.patch
Unescape View File

@ -1,71 +0,0 @@
# --- T2-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# T2 SDE: package/.../embutils/build.patch
# Copyright (C) 2004 - 2006 The T2 SDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- T2-COPYRIGHT-NOTE-END ---
Remove some unusal build system stuff, so that we can build it normally,
linked against any libc ...
- Rene Rebe <[email protected]>
--- embutils-0.17/Makefile 2005-01-31 19:06:38.000000000 +0100
+++ embutils-0.17-patched/Makefile 2005-02-02 12:54:27.383231704 +0100
@@ -1,9 +1,7 @@
INSTALL=install
-prefix=/opt/diet
+prefix=/usr
# Set the following to install to a different root
#DESTDIR=/tmp/fefix
-# Set the following to use the diet libc
-DIET=diet -Os
FLAGS=
@@ -15,30 +13,26 @@
truncate strings test date mount printenv umount pivot_root insmod rmmod \
lsmod
-ARCH:=$(shell uname -m | sed 's/i[4-9]86/i386/')
-
-OBJDIR:=bin-$(ARCH)
+OBJDIR:=bin
TARGETS=$(patsubst %,$(OBJDIR)/%,$(PRGS))
all: $(OBJDIR) $(TARGETS)
CFLAGS=-pipe -Os -fomit-frame-pointer
-CROSS=
-
#CFLAGS=-pipe -g
$(OBJDIR)/%.o: %.c
- $(DIET) $(CROSS)gcc $(CFLAGS) $(FLAGS) -c $< -o $@
- $(CROSS)strip -x -R .comment -R .note $@
+ $(CC) $(CFLAGS) $(FLAGS) -c $< -o $@
+ $(STRIP) -x -R .comment -R .note $@
$(OBJDIR)/%.o: %.S
- $(DIET) $(CROSS)gcc -pipe -c $< -o $@
+ $(CC) -pipe -c $< -o $@
$(OBJDIR)/%: $(OBJDIR)/%.o
- $(DIET) $(CROSS)gcc -o $@ $^
- $(CROSS)strip -R .note -R .comment $@
+ $(CC) -o $@ $^
+ $(STRIP) -R .note -R .comment $@
$(OBJDIR)/uniq: $(OBJDIR)/uniq.o $(OBJDIR)/fmt_ulongpadright.o $(OBJDIR)/fmt_ulong.o

19
base/embutils/embutils.conf
Unescape View File

@ -1,7 +1,8 @@
# --- T2-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# #
# T2 SDE: package/.../embutils/embutils.conf # Filename: package/.../embutils/embutils.conf
# Copyright (C) 2007 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# #
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
@ -10,10 +11,18 @@
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the
# GNU General Public License can be found in the file COPYING. # GNU General Public License can be found in the file COPYING.
# --- T2-COPYRIGHT-NOTE-END --- # --- SDE-COPYRIGHT-NOTE-END ---
if pkginstalled coreutils && [ $prefix_auto = 1 ] ; then if pkginstalled coreutils && [ $prefix_auto = 1 ] ; then
hook_add inmake 5 'mkdir -p $root/$prefix/embutils' prefix=usr/embutils
var_append INSTALL_WRAPPER_FILTER "|" "sed -e 's,$prefix/bin/,$prefix/embutils/,'" set_confopt
hook_add postpatch 5 "rm -rf $root$bindir; ln -svf . $root$bindir"
hook_add postmake 5 "rm -f $root$bindir"
fi fi
var_append makeopt ' ' "ARCH=$( echo $arch | arch2uname )"
var_append makeopt ' ' "DIET="
var_append makeopt ' ' "CROSS=${archprefix}"
makeinstopt="$makeopt install"
var_append makeinstopt ' ' "DESTDIR=$root"

6
base/embutils/embutils.desc
Unescape View File

@ -20,7 +20,7 @@
[T] on. [T] on.
[A] Felix von Leitner <[email protected]> [A] Felix von Leitner <[email protected]>
[M] The OpenSDE Community <list@opensde.org> [M] Alejandro Mery <amery@opensde.org>
[F] DIETLIBC [F] DIETLIBC
@ -28,8 +28,8 @@
[L] GPL [L] GPL
[S] Beta [S] Beta
[V] 0.17 [V] 0.18
[P] X -1---5---9 102.040 [P] X -1---5---9 102.040
[D] 2768546223 embutils-0.17.tar.bz2 http://www.fefe.de/embutils/ [D] 835572 embutils-0.18.tar.bz2 http://dl.fefe.de/

27
base/embutils/free.patch
Unescape View File

@ -1,7 +1,8 @@
# --- T2-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# #
# T2 SDE: package/.../embutils/free.patch # Filename: package/.../embutils/free.patch
# Copyright (C) 2007 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# #
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
@ -12,23 +13,23 @@
# of the GNU General Public License as published by the Free Software # of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later # Foundation; either version 2 of the License, or (at your option) any later
# version. # version.
# --- T2-COPYRIGHT-NOTE-END --- # --- SDE-COPYRIGHT-NOTE-END ---
A memory foodprint overview can be quite handy. A memory foodprint overview can be quite handy.
Rene Rebe <[email protected]> Rene Rebe <[email protected]>
--- embutils-0.17/Makefile 2005-01-31 19:06:38.000000000 +0100 --- ./Makefile.orig 2007-03-28 00:46:09.000000000 -0400
+++ embutils-0.17-free/Makefile 2005-02-07 01:38:31.322742920 +0100 +++ ./Makefile 2007-03-28 00:46:49.000000000 -0400
@@ -13,7 +13,7 @@ @@ -12,7 +12,7 @@
install sosrm soscp sosmv sosln soslns md5sum sleep2 allinone kill uniq \ domainname id ln mv cp yes which cat rm wc ls whoami mkfifo head install \
dd tr mesg write touch du tail uuencode uudecode nohup nice cmp mktemp \ sosrm soscp sosmv sosln soslns md5sum sleep2 allinone uniq tr mesg du \
truncate strings test date mount printenv umount pivot_root insmod rmmod \ uuencode uudecode nohup nice cmp mktemp truncate strings test date \
-lsmod -printenv chrootuid renice
+lsmod free +printenv chrootuid renice free
ARCH:=$(shell uname -m | sed 's/i[4-9]86/i386/')
OS:=$(shell uname)
ifeq ($(OS),Linux)
--- /dev/null 2005-02-03 08:15:19.790903464 +0100 --- /dev/null 2005-02-03 08:15:19.790903464 +0100
+++ embutils-0.17-free/free.c 2005-02-07 01:35:28.941469088 +0100 +++ embutils-0.17-free/free.c 2005-02-07 01:35:28.941469088 +0100
@@ -0,0 +1,90 @@ @@ -0,0 +1,90 @@

27
base/embutils/losetup.patch
Unescape View File

@ -1,7 +1,8 @@
# --- T2-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# #
# T2 SDE: package/.../embutils/losetup.patch # Filename: package/.../embutils/losetup.patch
# Copyright (C) 2007 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# #
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
@ -12,7 +13,7 @@
# of the GNU General Public License as published by the Free Software # of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later # Foundation; either version 2 of the License, or (at your option) any later
# version. # version.
# --- T2-COPYRIGHT-NOTE-END --- # --- SDE-COPYRIGHT-NOTE-END ---
Guess what ,-) Guess what ,-)
@ -86,14 +87,14 @@ Guess what ,-)
+ close(fd); + close(fd);
+ } + }
+} +}
--- embutils-0.17/Makefile.orig 2005-06-19 13:46:49.000000000 +0200 --- ./Makefile.orig 2007-03-28 00:46:09.000000000 -0400
+++ embutils-0.17/Makefile 2005-05-31 11:53:22.000000000 +0200 +++ ./Makefile 2007-03-28 00:46:49.000000000 -0400
@@ -11,7 +11,7 @@ @@ -12,7 +12,7 @@
install sosrm soscp sosmv sosln soslns md5sum sleep2 allinone kill uniq \ domainname id ln mv cp yes which cat rm wc ls whoami mkfifo head install \
dd tr mesg write touch du tail uuencode uudecode nohup nice cmp mktemp \ sosrm soscp sosmv sosln soslns md5sum sleep2 allinone uniq tr mesg du \
truncate strings test date mount printenv umount pivot_root insmod rmmod \ uuencode uudecode nohup nice cmp mktemp truncate strings test date \
-lsmod free -printenv chrootuid renice free
+lsmod free losetup +printenv chrootuid renice free losetup
OBJDIR:=bin OS:=$(shell uname)
TARGETS=$(patsubst %,$(OBJDIR)/%,$(PRGS)) ifeq ($(OS),Linux)

31
base/embutils/no-shared.patch
Unescape View File

@ -1,31 +0,0 @@
# --- T2-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# T2 SDE: package/.../embutils/no-shared.patch
# Copyright (C) 2004 - 2006 The T2 SDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- T2-COPYRIGHT-NOTE-END ---
We later might like to disable more.
- Rene Rebe <[email protected]>
--- embutils-0.17-patched/Makefile.orig 2005-02-02 13:12:10.851559944 +0100
+++ embutils-0.17-patched/Makefile 2005-02-02 13:12:15.720819704 +0100
@@ -10,7 +10,7 @@
dirname domainname id ln mv cp yes which cat rm wc ls whoami mkfifo head \
install sosrm soscp sosmv sosln soslns md5sum sleep2 allinone kill uniq \
dd tr mesg write touch du tail uuencode uudecode nohup nice cmp mktemp \
-truncate strings test date mount printenv umount pivot_root insmod rmmod \
+truncate test date mount printenv umount pivot_root insmod rmmod \
lsmod free losetup
OBJDIR:=bin

63
base/embutils/parallelism.patch
Unescape View File

@ -0,0 +1,63 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../embutils/parallelism.patch
# Copyright (C) 2007 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- ./Makefile.orig 2006-08-03 06:54:04.000000000 -0400
+++ ./Makefile 2007-03-28 00:21:50.000000000 -0400
@@ -33,13 +33,11 @@
#CFLAGS=-pipe -g
-$(OBJDIR)/%.o: %.c
- @test -d $(OBJDIR) || mkdir $(OBJDIR)
+$(OBJDIR)/%.o: %.c $(OBJDIR)
$(DIET) $(CROSS)gcc $(CFLAGS) $(FLAGS) -c $< -o $@
$(CROSS)strip -x -R .comment -R .note $@
$(OBJDIR)/%.o: %.S $(OBJDIR)
- @test -d $(OBJDIR) || mkdir $(OBJDIR)
$(DIET) $(CROSS)gcc -pipe -c $< -o $@
$(OBJDIR)/%: $(OBJDIR)/%.o
@@ -51,13 +49,13 @@
$(OBJDIR)/renice: $(OBJDIR)/renice.o $(OBJDIR)/fmt_long.o $(OBJDIR)/fmt_ulong.o
$(OBJDIR)/cp: $(OBJDIR)/mv
- ln -s mv $@
+ ln -sf mv $@
$(OBJDIR)/chgrp: $(OBJDIR)/chown
- -ln -s chown $@
+ ln -sf chown $@
$(OBJDIR)/mkfifo: $(OBJDIR)/mknod
- ln -s mknod $@
+ ln -sf mknod $@
$(OBJDIR)/mknod.o $(OBJDIR)/mkdir.o: error.c parsemode.c
@@ -100,9 +98,9 @@
install: $(TARGETS)
test -d $(DESTDIR)$(prefix)/bin || mkdir -p $(DESTDIR)$(prefix)/bin
$(INSTALL) $(TARGETS) $(DESTDIR)$(prefix)/bin
- -ln -f $(DESTDIR)$(prefix)/bin/chown $(DESTDIR)$(prefix)/bin/chgrp
- -ln -f $(DESTDIR)$(prefix)/bin/mv $(DESTDIR)$(prefix)/bin/cp
- -ln -f $(DESTDIR)$(prefix)/bin/mknod $(DESTDIR)$(prefix)/bin/mkfifo
+ -ln -sf chown $(DESTDIR)$(prefix)/bin/chgrp
+ -ln -sf mv $(DESTDIR)$(prefix)/bin/cp
+ -ln -sf mknod $(DESTDIR)$(prefix)/bin/mkfifo
uninstall:
rm -f $(patsubst %,$(DESTDIR)$(prefix)/bin/%,$(PRGS))

31
base/embutils/which-wd.patch
Unescape View File

@ -1,31 +0,0 @@
# --- T2-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# T2 SDE: package/.../embutils/which-wd.patch
# Copyright (C) 2004 - 2006 The T2 SDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- T2-COPYRIGHT-NOTE-END ---
Fixed which to inject a . when nothing is found between colons, so current
working directory binaries are located.
- Rene Rebe <[email protected]>
--- embutils-0.17/which.c 2002-05-27 17:23:26.000000000 +0200
+++ embutils-0.17-free/which.c 2005-02-14 17:08:41.453217816 +0100
@@ -32,6 +32,7 @@
struct stat ss;
char *bar=(char*)alloca(strlen(tmp)+strlen(argv[i])+5);
int len=str_copy(bar,tmp);
+ if (len==0) { *bar='.'; len++; }
bar[len]='/'; ++len;
len+=str_copy(bar+len,argv[i]);
bar[len]=0;

27
base/embutils/x-switch_root.patch
Unescape View File

@ -1,7 +1,8 @@
# --- T2-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# #
# T2 SDE: package/.../embutils/x-switch_root.patch # Filename: package/.../embutils/x-switch_root.patch
# Copyright (C) 2007 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# #
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
@ -12,7 +13,7 @@
# of the GNU General Public License as published by the Free Software # of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later # Foundation; either version 2 of the License, or (at your option) any later
# version. # version.
# --- T2-COPYRIGHT-NOTE-END --- # --- SDE-COPYRIGHT-NOTE-END ---
pivot_root'ing rootfs does uncover kernel inf. loops, thus I extraced some pivot_root'ing rootfs does uncover kernel inf. loops, thus I extraced some
bits form the Fedora Core's nash to trick around with moving the mount point bits form the Fedora Core's nash to trick around with moving the mount point
@ -174,14 +175,14 @@ and chroot to move the real root device to / - yuck.
+ return fd; + return fd;
+} +}
+ +
--- embutils-0.17/Makefile 2005-08-27 18:34:54.000000000 +0000 --- ./Makefile.orig 2007-03-28 00:46:09.000000000 -0400
+++ embutils-0.17-more/Makefile 2005-08-27 18:36:59.000000000 +0000 +++ ./Makefile 2007-03-28 00:46:49.000000000 -0400
@@ -11,7 +11,7 @@ @@ -12,7 +12,7 @@
install sosrm soscp sosmv sosln soslns md5sum sleep2 allinone kill uniq \ domainname id ln mv cp yes which cat rm wc ls whoami mkfifo head install \
dd tr mesg write touch du tail uuencode uudecode nohup nice cmp mktemp \ sosrm soscp sosmv sosln soslns md5sum sleep2 allinone uniq tr mesg du \
truncate test date mount printenv umount pivot_root insmod rmmod \ uuencode uudecode nohup nice cmp mktemp truncate strings test date \
-lsmod free losetup -printenv chrootuid renice free losetup
+lsmod free losetup switch_root +printenv chrootuid renice free losetup switch_root
OBJDIR:=bin OS:=$(shell uname)
TARGETS=$(patsubst %,$(OBJDIR)/%,$(PRGS)) ifeq ($(OS),Linux)

28
base/embutils/xx-readlink.patch
Unescape View File

@ -1,7 +1,8 @@
# --- T2-COPYRIGHT-NOTE-BEGIN --- # --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# #
# T2 SDE: package/.../embutils/xx-readlink.patch # Filename: package/.../embutils/xx-readlink.patch
# Copyright (C) 2007 The OpenSDE Project
# Copyright (C) 2006 The T2 SDE Project # Copyright (C) 2006 The T2 SDE Project
# #
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
@ -12,24 +13,23 @@
# of the GNU General Public License as published by the Free Software # of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later # Foundation; either version 2 of the License, or (at your option) any later
# version. # version.
# --- T2-COPYRIGHT-NOTE-END --- # --- SDE-COPYRIGHT-NOTE-END ---
A tiny readlink I need (advanced features of the installer). A tiny readlink I need (advanced features of the installer).
- Rene Rebe <[email protected]> - Rene Rebe <[email protected]>
diff -urN embutils-0.17/Makefile embutils-0.17-patched/Makefile --- ./Makefile.orig 2007-03-28 00:46:09.000000000 -0400
--- embutils-0.17/Makefile 2005-12-19 00:15:55.000000000 +0100 +++ ./Makefile 2007-03-28 00:46:49.000000000 -0400
+++ embutils-0.17-patched/Makefile 2005-12-18 23:50:38.000000000 +0100 @@ -12,7 +12,7 @@
@@ -11,7 +11,7 @@ domainname id ln mv cp yes which cat rm wc ls whoami mkfifo head install \
install sosrm soscp sosmv sosln soslns md5sum sleep2 allinone kill uniq \ sosrm soscp sosmv sosln soslns md5sum sleep2 allinone uniq tr mesg du \
dd tr mesg write touch du tail uuencode uudecode nohup nice cmp mktemp \ uuencode uudecode nohup nice cmp mktemp truncate strings test date \
truncate test date mount printenv umount pivot_root insmod rmmod \ -printenv chrootuid renice free losetup switch_root
-lsmod free losetup switch_root +printenv chrootuid renice free losetup switch_root readlink
+lsmod free losetup switch_root readlink
OBJDIR:=bin OS:=$(shell uname)
TARGETS=$(patsubst %,$(OBJDIR)/%,$(PRGS)) ifeq ($(OS),Linux)
diff -urN embutils-0.17/readlink.c embutils-0.17-patched/readlink.c diff -urN embutils-0.17/readlink.c embutils-0.17-patched/readlink.c
--- embutils-0.17/readlink.c 1970-01-01 01:00:00.000000000 +0100 --- embutils-0.17/readlink.c 1970-01-01 01:00:00.000000000 +0100
+++ embutils-0.17-patched/readlink.c 2005-12-19 00:13:23.000000000 +0100 +++ embutils-0.17-patched/readlink.c 2005-12-19 00:13:23.000000000 +0100

Write Preview
Loading…
Cancel
Save