From 6cb518c68eb136ad448e96716ef8b1348440949f Mon Sep 17 00:00:00 2001 From: Jonas Bjurel Date: Mon, 2 Mar 2015 22:46:45 +0100 Subject: Starting point for ODL Integration ***CAN BE MERGED*** - ODL build and installation (puppet manifests) including needed dependencies - Modified in accordance with Randy Levensalors comments - Added chmod 4755 /bin/fusermount due to that lately some systems dont install fuseiso withe SUID set for fusermount. Investing ongoing on why and why not consistent. - Rebased with master - ODL disabled in top Make (enable it by uncommenting the odl dirs - Removed white spaces - Hopefully fixed an issue with the docker ubuntu repos, added --no-cache=true to the fuel/docker/Make file. TODO: - Refactor collecting ODL and Java dependencies to one common place - Refactoring top Makefile - Adding CI hooks for build and deploy - Finishing integration plumbing wit Neutron/ML2 and OVS/OVSDB Change-Id: I13dd4d3a72d099316dfaa9f7cd9140781be2397b Signed-off-by: Jonas Bjurel --- fuel-build/patch-packages/tools/deb_unpack | 58 ------------------------------ 1 file changed, 58 deletions(-) delete mode 100755 fuel-build/patch-packages/tools/deb_unpack (limited to 'fuel-build/patch-packages/tools/deb_unpack') diff --git a/fuel-build/patch-packages/tools/deb_unpack b/fuel-build/patch-packages/tools/deb_unpack deleted file mode 100755 index aaa60b7..0000000 --- a/fuel-build/patch-packages/tools/deb_unpack +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/bash -e -############################################################################## -# Copyright (c) 2015 Ericsson AB and others. -# stefan.k.berg@ericsson.com -# jonas.bjurel@ericsson.com -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - - -my_exit() { - - if [ -d "$ISOROOT" ]; then - fusermount -u $ISOROOT - fi -} - -ME=$(basename $0) - -trap my_exit EXIT - - -if [ -z "$1" ]; then - echo "$ME: Error - No package specified" - exit 1 -fi - -if [ -z "$2" ]; then - echo "$ME: Error - No ISO path specified" - exit 1 -fi - -DEB=$1 -ORIGISO=$2 -DEST=package - -if [ -e $DEST -o -d $DEST ]; then - echo "$ME: Error - $DEST already exists" - exit 1 -fi - -ISOROOT=`mktemp -d /tmp/XXXXXXX` -fuseiso -p $ORIGISO $ISOROOT -sleep 1 - -if [ ! -f $ISOROOT/ubuntu/pool/main/$DEB ];then - echo "Could not find package $DEB in source ISO!" -fi - -mkdir -p $DEST -dpkg -x $ISOROOT/ubuntu/pool/main/$DEB $DEST - -mkdir -p $DEST/DEBIAN -dpkg -e $ISOROOT/ubuntu/pool/main/$DEB $DEST/DEBIAN - -echo $DEB > .package \ No newline at end of file -- cgit 1.2.3-korg