From 0646071e4e3c8bb0f3e396d9318c94a97883d656 Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Wed, 28 Mar 2007 02:02:47 +0000 Subject: [PATCH] * updated embutils (0.17 -> 0.18) - close #253 git-svn-id: svn://svn.opensde.net/opensde/package/trunk@20585 10447126-35f2-4685-b0cf-6dd780d3921f --- base/embutils/build.patch | 71 ------------------------------- base/embutils/embutils.conf | 19 ++++++--- base/embutils/embutils.desc | 6 +-- base/embutils/free.patch | 27 ++++++------ base/embutils/losetup.patch | 27 ++++++------ base/embutils/no-shared.patch | 31 -------------- base/embutils/parallelism.patch | 63 +++++++++++++++++++++++++++ base/embutils/which-wd.patch | 31 -------------- base/embutils/x-switch_root.patch | 27 ++++++------ base/embutils/xx-readlink.patch | 28 ++++++------ 10 files changed, 136 insertions(+), 194 deletions(-) delete mode 100644 base/embutils/build.patch delete mode 100644 base/embutils/no-shared.patch create mode 100644 base/embutils/parallelism.patch delete mode 100644 base/embutils/which-wd.patch diff --git a/base/embutils/build.patch b/base/embutils/build.patch deleted file mode 100644 index f86415e3b..000000000 --- a/base/embutils/build.patch +++ /dev/null @@ -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 - ---- 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 - diff --git a/base/embutils/embutils.conf b/base/embutils/embutils.conf index 22ba44e66..12981b103 100644 --- a/base/embutils/embutils.conf +++ b/base/embutils/embutils.conf @@ -1,7 +1,8 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- +# --- SDE-COPYRIGHT-NOTE-BEGIN --- # 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 # # 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 # the Free Software Foundation; version 2 of the License. A copy of the # 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 - hook_add inmake 5 'mkdir -p $root/$prefix/embutils' - var_append INSTALL_WRAPPER_FILTER "|" "sed -e 's,$prefix/bin/,$prefix/embutils/,'" + prefix=usr/embutils + set_confopt + hook_add postpatch 5 "rm -rf $root$bindir; ln -svf . $root$bindir" + hook_add postmake 5 "rm -f $root$bindir" 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" diff --git a/base/embutils/embutils.desc b/base/embutils/embutils.desc index a8da53075..0b1eba174 100644 --- a/base/embutils/embutils.desc +++ b/base/embutils/embutils.desc @@ -20,7 +20,7 @@ [T] on. [A] Felix von Leitner -[M] The OpenSDE Community +[M] Alejandro Mery [F] DIETLIBC @@ -28,8 +28,8 @@ [L] GPL [S] Beta -[V] 0.17 +[V] 0.18 [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/ diff --git a/base/embutils/free.patch b/base/embutils/free.patch index 80a8b8250..03ba96fd7 100644 --- a/base/embutils/free.patch +++ b/base/embutils/free.patch @@ -1,7 +1,8 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- +# --- SDE-COPYRIGHT-NOTE-BEGIN --- # 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 # # 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 # Foundation; either version 2 of the License, or (at your option) any later # version. -# --- T2-COPYRIGHT-NOTE-END --- +# --- SDE-COPYRIGHT-NOTE-END --- A memory foodprint overview can be quite handy. Rene Rebe ---- embutils-0.17/Makefile 2005-01-31 19:06:38.000000000 +0100 -+++ embutils-0.17-free/Makefile 2005-02-07 01:38:31.322742920 +0100 -@@ -13,7 +13,7 @@ - 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 \ --lsmod -+lsmod free - - ARCH:=$(shell uname -m | sed 's/i[4-9]86/i386/') +--- ./Makefile.orig 2007-03-28 00:46:09.000000000 -0400 ++++ ./Makefile 2007-03-28 00:46:49.000000000 -0400 +@@ -12,7 +12,7 @@ + domainname id ln mv cp yes which cat rm wc ls whoami mkfifo head install \ + sosrm soscp sosmv sosln soslns md5sum sleep2 allinone uniq tr mesg du \ + uuencode uudecode nohup nice cmp mktemp truncate strings test date \ +-printenv chrootuid renice ++printenv chrootuid renice free + OS:=$(shell uname) + ifeq ($(OS),Linux) --- /dev/null 2005-02-03 08:15:19.790903464 +0100 +++ embutils-0.17-free/free.c 2005-02-07 01:35:28.941469088 +0100 @@ -0,0 +1,90 @@ diff --git a/base/embutils/losetup.patch b/base/embutils/losetup.patch index f6f0a6983..1eef07a55 100644 --- a/base/embutils/losetup.patch +++ b/base/embutils/losetup.patch @@ -1,7 +1,8 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- +# --- SDE-COPYRIGHT-NOTE-BEGIN --- # 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 # # 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 # Foundation; either version 2 of the License, or (at your option) any later # version. -# --- T2-COPYRIGHT-NOTE-END --- +# --- SDE-COPYRIGHT-NOTE-END --- Guess what ,-) @@ -86,14 +87,14 @@ Guess what ,-) + close(fd); + } +} ---- embutils-0.17/Makefile.orig 2005-06-19 13:46:49.000000000 +0200 -+++ embutils-0.17/Makefile 2005-05-31 11:53:22.000000000 +0200 -@@ -11,7 +11,7 @@ - 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 \ --lsmod free -+lsmod free losetup +--- ./Makefile.orig 2007-03-28 00:46:09.000000000 -0400 ++++ ./Makefile 2007-03-28 00:46:49.000000000 -0400 +@@ -12,7 +12,7 @@ + domainname id ln mv cp yes which cat rm wc ls whoami mkfifo head install \ + sosrm soscp sosmv sosln soslns md5sum sleep2 allinone uniq tr mesg du \ + uuencode uudecode nohup nice cmp mktemp truncate strings test date \ +-printenv chrootuid renice free ++printenv chrootuid renice free losetup - OBJDIR:=bin - TARGETS=$(patsubst %,$(OBJDIR)/%,$(PRGS)) + OS:=$(shell uname) + ifeq ($(OS),Linux) diff --git a/base/embutils/no-shared.patch b/base/embutils/no-shared.patch deleted file mode 100644 index ed9c8a8cd..000000000 --- a/base/embutils/no-shared.patch +++ /dev/null @@ -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 - ---- 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 diff --git a/base/embutils/parallelism.patch b/base/embutils/parallelism.patch new file mode 100644 index 000000000..cadf747ca --- /dev/null +++ b/base/embutils/parallelism.patch @@ -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)) diff --git a/base/embutils/which-wd.patch b/base/embutils/which-wd.patch deleted file mode 100644 index e539e9c0e..000000000 --- a/base/embutils/which-wd.patch +++ /dev/null @@ -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 - ---- 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; diff --git a/base/embutils/x-switch_root.patch b/base/embutils/x-switch_root.patch index f9a4aeb46..bc4c3e6ff 100644 --- a/base/embutils/x-switch_root.patch +++ b/base/embutils/x-switch_root.patch @@ -1,7 +1,8 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- +# --- SDE-COPYRIGHT-NOTE-BEGIN --- # 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 # # 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 # Foundation; either version 2 of the License, or (at your option) any later # version. -# --- T2-COPYRIGHT-NOTE-END --- +# --- SDE-COPYRIGHT-NOTE-END --- 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 @@ -174,14 +175,14 @@ and chroot to move the real root device to / - yuck. + return fd; +} + ---- embutils-0.17/Makefile 2005-08-27 18:34:54.000000000 +0000 -+++ embutils-0.17-more/Makefile 2005-08-27 18:36:59.000000000 +0000 -@@ -11,7 +11,7 @@ - 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 test date mount printenv umount pivot_root insmod rmmod \ --lsmod free losetup -+lsmod free losetup switch_root +--- ./Makefile.orig 2007-03-28 00:46:09.000000000 -0400 ++++ ./Makefile 2007-03-28 00:46:49.000000000 -0400 +@@ -12,7 +12,7 @@ + domainname id ln mv cp yes which cat rm wc ls whoami mkfifo head install \ + sosrm soscp sosmv sosln soslns md5sum sleep2 allinone uniq tr mesg du \ + uuencode uudecode nohup nice cmp mktemp truncate strings test date \ +-printenv chrootuid renice free losetup ++printenv chrootuid renice free losetup switch_root - OBJDIR:=bin - TARGETS=$(patsubst %,$(OBJDIR)/%,$(PRGS)) + OS:=$(shell uname) + ifeq ($(OS),Linux) diff --git a/base/embutils/xx-readlink.patch b/base/embutils/xx-readlink.patch index c241e1db5..1ffac1204 100644 --- a/base/embutils/xx-readlink.patch +++ b/base/embutils/xx-readlink.patch @@ -1,7 +1,8 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- +# --- SDE-COPYRIGHT-NOTE-BEGIN --- # 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 # # 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 # Foundation; either version 2 of the License, or (at your option) any later # version. -# --- T2-COPYRIGHT-NOTE-END --- +# --- SDE-COPYRIGHT-NOTE-END --- A tiny readlink I need (advanced features of the installer). - Rene Rebe -diff -urN embutils-0.17/Makefile embutils-0.17-patched/Makefile ---- embutils-0.17/Makefile 2005-12-19 00:15:55.000000000 +0100 -+++ embutils-0.17-patched/Makefile 2005-12-18 23:50:38.000000000 +0100 -@@ -11,7 +11,7 @@ - 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 test date mount printenv umount pivot_root insmod rmmod \ --lsmod free losetup switch_root -+lsmod free losetup switch_root readlink +--- ./Makefile.orig 2007-03-28 00:46:09.000000000 -0400 ++++ ./Makefile 2007-03-28 00:46:49.000000000 -0400 +@@ -12,7 +12,7 @@ + domainname id ln mv cp yes which cat rm wc ls whoami mkfifo head install \ + sosrm soscp sosmv sosln soslns md5sum sleep2 allinone uniq tr mesg du \ + uuencode uudecode nohup nice cmp mktemp truncate strings test date \ +-printenv chrootuid renice free losetup switch_root ++printenv chrootuid renice free losetup switch_root readlink - OBJDIR:=bin - TARGETS=$(patsubst %,$(OBJDIR)/%,$(PRGS)) + OS:=$(shell uname) + ifeq ($(OS),Linux) 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-patched/readlink.c 2005-12-19 00:13:23.000000000 +0100