summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /sys-apps/usermode-utilities
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'sys-apps/usermode-utilities')
-rw-r--r--sys-apps/usermode-utilities/Manifest1
-rw-r--r--sys-apps/usermode-utilities/files/usermode-utilities-20070815-humfsify-owner.patch12
-rw-r--r--sys-apps/usermode-utilities/files/usermode-utilities-20070815-rollup.patch101
-rw-r--r--sys-apps/usermode-utilities/metadata.xml10
-rw-r--r--sys-apps/usermode-utilities/usermode-utilities-20070815-r3.ebuild40
5 files changed, 164 insertions, 0 deletions
diff --git a/sys-apps/usermode-utilities/Manifest b/sys-apps/usermode-utilities/Manifest
new file mode 100644
index 000000000000..9017b8dfcc69
--- /dev/null
+++ b/sys-apps/usermode-utilities/Manifest
@@ -0,0 +1 @@
+DIST uml_utilities_20070815.tar.bz2 50159 SHA256 f815f591a1c177729546969acf720958c5fd72b8d4d36bae26fdc5b64669b60e SHA512 a246ca04bcba2282ceb976e69399f496cc85d14ee13c1e4704f943d7fcef032eda92e9e8c4341f6e8878c6353ed97c7f77b283e62e152987c792a7a6258f1d1a WHIRLPOOL 343e755da98d3d6a714a7c26cc917b01af7fc737c4a24806ad04c902e5a919cfdd831c3b18d7a2c5c7a271266f58d167ab9a788543b5a0f5671b9a6b639a37b1
diff --git a/sys-apps/usermode-utilities/files/usermode-utilities-20070815-humfsify-owner.patch b/sys-apps/usermode-utilities/files/usermode-utilities-20070815-humfsify-owner.patch
new file mode 100644
index 000000000000..9d02498052f0
--- /dev/null
+++ b/sys-apps/usermode-utilities/files/usermode-utilities-20070815-humfsify-owner.patch
@@ -0,0 +1,12 @@
+diff '--exclude-from=/home/dang/.scripts/diffrc' -up -ruN tools-20070815.orig/humfsify/Makefile tools-20070815/humfsify/Makefile
+--- tools-20070815.orig/humfsify/Makefile 2006-05-25 14:37:01.000000000 -0400
++++ tools-20070815/humfsify/Makefile 2011-05-02 11:04:32.531034342 -0400
+@@ -4,7 +4,7 @@ all:
+
+ install:
+ install -d $(DESTDIR)$(BIN_DIR)
+- install -o 0755 $(BIN) $(DESTDIR)$(BIN_DIR)
++ install -m 0755 $(BIN) $(DESTDIR)$(BIN_DIR)
+
+ clean:
+ rm -f *~
diff --git a/sys-apps/usermode-utilities/files/usermode-utilities-20070815-rollup.patch b/sys-apps/usermode-utilities/files/usermode-utilities-20070815-rollup.patch
new file mode 100644
index 000000000000..f88e20663f5b
--- /dev/null
+++ b/sys-apps/usermode-utilities/files/usermode-utilities-20070815-rollup.patch
@@ -0,0 +1,101 @@
+diff '--exclude-from=/home/dang/.scripts/diffrc' -up -ruN tools-20070815.orig/jail/Makefile tools-20070815/jail/Makefile
+--- tools-20070815.orig/jail/Makefile 2006-02-27 14:51:46.000000000 -0500
++++ tools-20070815/jail/Makefile 2010-08-04 22:17:56.869103217 -0400
+@@ -11,7 +11,7 @@ $(BIN) : $(OBJS)
+
+ install : $(BIN)
+ install -d $(DESTDIR)$(SBIN_DIR)
+- install -s $(BIN) $(DESTDIR)$(SBIN_DIR)
++ install $(BIN) $(DESTDIR)$(SBIN_DIR)
+
+ clean :
+ rm -rf *~ $(BIN) $(OBJS) cell[0-9]* core* tty_log_cell*
+diff '--exclude-from=/home/dang/.scripts/diffrc' -up -ruN tools-20070815.orig/jailtest/Makefile tools-20070815/jailtest/Makefile
+--- tools-20070815.orig/jailtest/Makefile 2006-02-27 14:52:53.000000000 -0500
++++ tools-20070815/jailtest/Makefile 2010-08-04 22:17:56.870032258 -0400
+@@ -14,4 +14,4 @@ clean :
+
+ install : $(BIN)
+ install -d $(DESTDIR)$(BIN_DIR)
+- install -s $(BIN) $(DESTDIR)$(BIN_DIR)
++ install $(BIN) $(DESTDIR)$(BIN_DIR)
+diff '--exclude-from=/home/dang/.scripts/diffrc' -up -ruN tools-20070815.orig/mconsole/Makefile tools-20070815/mconsole/Makefile
+--- tools-20070815.orig/mconsole/Makefile 2006-02-27 15:03:01.000000000 -0500
++++ tools-20070815/mconsole/Makefile 2010-08-04 22:17:56.916031770 -0400
+@@ -15,4 +15,4 @@ clean :
+
+ install : $(BIN)
+ install -d $(DESTDIR)$(BIN_DIR)
+- install -s $(BIN) $(DESTDIR)$(BIN_DIR)
++ install $(BIN) $(DESTDIR)$(BIN_DIR)
+diff '--exclude-from=/home/dang/.scripts/diffrc' -up -ruN tools-20070815.orig/moo/Makefile tools-20070815/moo/Makefile
+--- tools-20070815.orig/moo/Makefile 2006-02-27 15:08:49.000000000 -0500
++++ tools-20070815/moo/Makefile 2010-08-04 22:17:56.938282085 -0400
+@@ -23,4 +23,4 @@ clean :
+
+ install : $(BIN)
+ install -d $(DESTDIR)$(BIN_DIR)
+- install -s $(BIN) $(DESTDIR)$(BIN_DIR)
++ install $(BIN) $(DESTDIR)$(BIN_DIR)
+diff '--exclude-from=/home/dang/.scripts/diffrc' -up -ruN tools-20070815.orig/port-helper/Makefile tools-20070815/port-helper/Makefile
+--- tools-20070815.orig/port-helper/Makefile 2006-02-27 15:18:40.000000000 -0500
++++ tools-20070815/port-helper/Makefile 2010-08-04 22:17:56.938282085 -0400
+@@ -15,4 +15,4 @@ clean :
+
+ install : $(BIN)
+ install -d $(DESTDIR)$(LIB_DIR)
+- install -s $(BIN) $(DESTDIR)$(LIB_DIR)
++ install $(BIN) $(DESTDIR)$(LIB_DIR)
+diff '--exclude-from=/home/dang/.scripts/diffrc' -up -ruN tools-20070815.orig/tunctl/Makefile tools-20070815/tunctl/Makefile
+--- tools-20070815.orig/tunctl/Makefile 2006-02-27 15:19:52.000000000 -0500
++++ tools-20070815/tunctl/Makefile 2010-08-04 22:17:56.939282225 -0400
+@@ -14,4 +14,4 @@ clean :
+
+ install : $(BIN)
+ install -d $(DESTDIR)$(BIN_DIR)
+- install -s $(BIN) $(DESTDIR)$(BIN_DIR)
++ install $(BIN) $(DESTDIR)$(BIN_DIR)
+diff '--exclude-from=/home/dang/.scripts/diffrc' -up -ruN tools-20070815.orig/umlfs/Makefile tools-20070815/umlfs/Makefile
+--- tools-20070815.orig/umlfs/Makefile 2006-02-27 16:11:25.000000000 -0500
++++ tools-20070815/umlfs/Makefile 2010-08-04 22:17:56.940282085 -0400
+@@ -16,4 +16,4 @@ clean :
+
+ install : $(BIN)
+ install -d $(DESTDIR)$(BIN_DIR)
+- install -s $(BIN) $(DESTDIR)$(BIN_DIR)
++ install $(BIN) $(DESTDIR)$(BIN_DIR)
+diff '--exclude-from=/home/dang/.scripts/diffrc' -up -ruN tools-20070815.orig/uml_net/Makefile tools-20070815/uml_net/Makefile
+--- tools-20070815.orig/uml_net/Makefile 2006-02-27 15:19:52.000000000 -0500
++++ tools-20070815/uml_net/Makefile 2010-08-04 22:23:40.459151826 -0400
+@@ -2,6 +2,7 @@ TUNTAP = $(shell [ -e /usr/include/linux
+
+ BIN = uml_net
+ CFLAGS ?= -g -Wall
++LDFLAGS += -Wl,-z,now
+ override CFLAGS += $(TUNTAP)
+
+ BIN_DIR ?= /usr/bin
+@@ -22,4 +23,4 @@ clean :
+
+ install : $(BIN)
+ install -d $(DESTDIR)$(BIN_DIR)
+- install -s -m 04755 $(BIN) $(DESTDIR)$(BIN_DIR)
++ install -m 04755 $(BIN) $(DESTDIR)$(BIN_DIR)
+diff '--exclude-from=/home/dang/.scripts/diffrc' -up -ruN tools-20070815.orig/uml_switch/Makefile tools-20070815/uml_switch/Makefile
+--- tools-20070815.orig/uml_switch/Makefile 2006-02-27 15:20:26.000000000 -0500
++++ tools-20070815/uml_switch/Makefile 2010-08-04 22:17:56.942283133 -0400
+@@ -21,4 +21,4 @@ clean :
+
+ install : $(BIN)
+ install -d $(DESTDIR)$(BIN_DIR)
+- install -s $(BIN) $(DESTDIR)$(BIN_DIR)
++ install $(BIN) $(DESTDIR)$(BIN_DIR)
+diff '--exclude-from=/home/dang/.scripts/diffrc' -up -ruN tools-20070815.orig/watchdog/Makefile tools-20070815/watchdog/Makefile
+--- tools-20070815.orig/watchdog/Makefile 2006-02-27 15:55:34.000000000 -0500
++++ tools-20070815/watchdog/Makefile 2010-08-04 22:17:56.943282225 -0400
+@@ -14,4 +14,4 @@ clean :
+
+ install : $(BIN)
+ install -d $(DESTDIR)$(BIN_DIR)
+- install -s $(BIN) $(DESTDIR)$(BIN_DIR)
++ install $(BIN) $(DESTDIR)$(BIN_DIR)
diff --git a/sys-apps/usermode-utilities/metadata.xml b/sys-apps/usermode-utilities/metadata.xml
new file mode 100644
index 000000000000..7741f8287f94
--- /dev/null
+++ b/sys-apps/usermode-utilities/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+ <email>maintainer-needed@gentoo.org</email>
+</maintainer>
+<use>
+ <flag name='fuse'>Build tools (currently umlmount) needing fuse</flag>
+</use>
+</pkgmetadata>
diff --git a/sys-apps/usermode-utilities/usermode-utilities-20070815-r3.ebuild b/sys-apps/usermode-utilities/usermode-utilities-20070815-r3.ebuild
new file mode 100644
index 000000000000..b6ae228bc591
--- /dev/null
+++ b/sys-apps/usermode-utilities/usermode-utilities-20070815-r3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Tools for use with Usermode Linux virtual machines"
+HOMEPAGE="http://user-mode-linux.sourceforge.net/"
+SRC_URI="http://user-mode-linux.sourceforge.net/uml_utilities_${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+IUSE="fuse"
+
+RDEPEND="fuse? ( sys-fs/fuse )
+ sys-libs/readline:0="
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/tools-${PV}
+
+src_prepare() {
+ # Merge previous patches with fix for bug #331099
+ epatch "${FILESDIR}"/${P}-rollup.patch
+ # Fix owner of humfsify; bug #364531
+ epatch "${FILESDIR}"/${P}-humfsify-owner.patch
+ sed -i -e 's:-o \$(BIN):$(LDFLAGS) -o $(BIN):' "${S}"/*/Makefile || die "LDFLAGS sed failed"
+ sed -i -e 's:-o \$@:$(LDFLAGS) -o $@:' "${S}"/moo/Makefile || die "LDFLAGS sed (moo) failed"
+ if ! use fuse; then
+ einfo "Skipping build of umlmount to avoid sys-fs/fuse dependency."
+ sed -i -e 's/\<umlfs\>//' Makefile || die "sed to remove sys-fs/fuse dependency failed"
+ fi
+}
+
+src_compile() {
+ tc-export AR CC
+ emake CFLAGS="${CFLAGS} ${CPPFLAGS} -DTUNTAP -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -g -Wall" all
+}