From e94d5484ecdf8021245d961479dae07ea2f8321f Mon Sep 17 00:00:00 2001 From: Jonas Bjurel Date: Sat, 3 Oct 2015 17:42:28 +0200 Subject: Removed fuel from Genesis master since fuel has moved to repo fuel. Change-Id: If264c47c2df95201fe96dc58cf0db6f572859529 Signed-off-by: Jonas Bjurel --- fuel/build/patch-packages/Makefile | 26 --------- fuel/build/patch-packages/tools/correct_deps | 78 --------------------------- fuel/build/patch-packages/tools/deb_pack | 63 ---------------------- fuel/build/patch-packages/tools/deb_unpack | 58 -------------------- fuel/build/patch-packages/tools/udeb_pack | 38 ------------- fuel/build/patch-packages/tools/udeb_unpack | 58 -------------------- fuel/build/patch-packages/tr_example/Makefile | 30 ----------- 7 files changed, 351 deletions(-) delete mode 100644 fuel/build/patch-packages/Makefile delete mode 100755 fuel/build/patch-packages/tools/correct_deps delete mode 100755 fuel/build/patch-packages/tools/deb_pack delete mode 100755 fuel/build/patch-packages/tools/deb_unpack delete mode 100755 fuel/build/patch-packages/tools/udeb_pack delete mode 100755 fuel/build/patch-packages/tools/udeb_unpack delete mode 100644 fuel/build/patch-packages/tr_example/Makefile (limited to 'fuel/build/patch-packages') diff --git a/fuel/build/patch-packages/Makefile b/fuel/build/patch-packages/Makefile deleted file mode 100644 index 339c9e7..0000000 --- a/fuel/build/patch-packages/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -############################################################################## -# 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 -############################################################################## - -SUBDIRS := -SUBCLEAN = $(addsuffix .clean,$(SUBDIRS)) - -.PHONY: $(SUBDIRS) $(SUBCLEAN) clean -$(SUBDIRS): - @mkdir -p release/packages - ORIGISO=$(ORIGISO) REVSTATE=$(REVSTATE) $(MAKE) -C $@ -f Makefile release - -release: $(SUBDIRS) - @echo $(ORIGISO) - -clean: $(SUBCLEAN) - @rm -Rf release - -$(SUBCLEAN): %.clean: - $(MAKE) -C $* -f Makefile clean diff --git a/fuel/build/patch-packages/tools/correct_deps b/fuel/build/patch-packages/tools/correct_deps deleted file mode 100755 index cfb7d53..0000000 --- a/fuel/build/patch-packages/tools/correct_deps +++ /dev/null @@ -1,78 +0,0 @@ -#!/bin/bash -############################################################################## -# 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 -############################################################################## - - -patch_package () { - deb=$1 - pkgdep=$2 - newrev=$3 - - - tmpdir=`mktemp -d /tmp/patchXXXXX` - - cp $deb $tmpdir - pushd $tmpdir > /dev/null - - mkdir -p repack - dpkg -x $deb repack - - mkdir -p repack/DEBIAN - dpkg -e $deb repack/DEBIAN - - - pushd repack/DEBIAN > /dev/null - - echo "Before: `cat control | grep '^Depends:'`" - sed -i "s/$pkgdep (\([^ ]*\) [^)]*)/$pkgdep (\1 $newrev)/" control - echo "After: `cat control | grep '^Depends:'`" - popd > /dev/null - - fakeroot dpkg-deb --build repack - - popd > /dev/null - - cp $tmpdir/repack.deb $deb - rm -Rf $tmpdir -} - -# Name of package for which to check dependencies to -PKGDEP=$1 -# The old revision of the package in question -OLDREV=$2 -# The new revision of the package in question -NEWREV=$3 - -if [ -z "$PKGDEP" ]; then - echo "No package dependency name" - exit 1 -fi - -if [ -z "$OLDREV" ]; then - echo "No old rev" - exit 1 -fi - -if [ -z "$NEWREV" ]; then - echo "No new rev" - exit 1 -fi - - -for deb in *.deb -do - ar p $deb control.tar.gz | tar xzO ./control | grep -q "^Depends:.* ${PKGDEP} ([^ ]* ${OLDREV})" - if [ $? -eq 0 ]; then - name=`ar p $deb control.tar.gz | tar xzO ./control | grep "^Package:.* " | sed 's/.* //'` - echo "**** Changing dependencies line in $deb ($name) ****" - patch_package $deb $PKGDEP $NEWREV - fi -done - diff --git a/fuel/build/patch-packages/tools/deb_pack b/fuel/build/patch-packages/tools/deb_pack deleted file mode 100755 index f5d42de..0000000 --- a/fuel/build/patch-packages/tools/deb_pack +++ /dev/null @@ -1,63 +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 - -REV="$(echo $1 | tr '_' '-')" -if [ -z "$REV" ]; then - echo "$ME: Error - no revision info provided" - exit 1 -fi - -if [ ! -d package ]; then - echo "$ME: Error - package directory does not exist" - exit 1 -fi - -echo "Stepping revision number to $REV" - - -revision_step () -{ - REV=$1 - - sed -i "s/^\(Version:.*$\)/\1-eri$REV/" package/DEBIAN/control -} - -md5sum_gen () -{ - pushd package - find * -type f | grep -v "^DEBIAN/" | xargs md5sum | sort > DEBIAN/md5sums - popd -} - -revision_step $REV -md5sum_gen -fakeroot dpkg-deb --build package -PKGNAME=`grep "^Package: " package/DEBIAN/control | awk '{ print $2 }'` -PKGREV=`grep "^Version: " package/DEBIAN/control | awk '{ print $2 }'` -mv package.deb ${PKGNAME}_${PKGREV}.deb - -ORIGPKG=`cat .package` - -# Add patch into file read by install.sh -echo "$ORIGPKG>${PKGNAME}_${PKGREV}.deb" > patch-replacements - 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 diff --git a/fuel/build/patch-packages/tools/udeb_pack b/fuel/build/patch-packages/tools/udeb_pack deleted file mode 100755 index e961a73..0000000 --- a/fuel/build/patch-packages/tools/udeb_pack +++ /dev/null @@ -1,38 +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 [ ! -d udebPackage ]; then - echo "$ME: Error - package directory does not exist" - exit 1 -fi - -echo "Stepping revision number to $REV" - - -fakeroot dpkg-deb --build -Zgzip udebPackage -PKGNAME=`grep "^Package: " udebPackage/DEBIAN/control | awk '{ print $2 }'` -PKGREV=`grep "^Version: " udebPackage/DEBIAN/control | awk '{ print $2 }'` -ARCH=`grep "^Architecture: " udebPackage/DEBIAN/control | awk '{ print $2 }'` -mv udebPackage.deb ${PKGNAME}_${PKGREV}_${ARCH}.udeb - -ORIGPKG=`cat .udebpackage` diff --git a/fuel/build/patch-packages/tools/udeb_unpack b/fuel/build/patch-packages/tools/udeb_unpack deleted file mode 100755 index ed9cd21..0000000 --- a/fuel/build/patch-packages/tools/udeb_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=udebPackage - -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/debian-installer/$DEB ];then - echo "Could not find package $DEB in source ISO!" -fi - -mkdir -p $DEST -dpkg -x $ISOROOT/ubuntu/pool/debian-installer/$DEB $DEST - -mkdir -p $DEST/DEBIAN -dpkg -e $ISOROOT/ubuntu/pool/debian-installer/$DEB $DEST/DEBIAN - -echo $DEB > .udebpackage diff --git a/fuel/build/patch-packages/tr_example/Makefile b/fuel/build/patch-packages/tr_example/Makefile deleted file mode 100644 index b7cab35..0000000 --- a/fuel/build/patch-packages/tr_example/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -############################################################################## -# 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 -############################################################################## - -TOP := $(shell pwd) - -.PHONY: all -all: - -.PHONY: clean -clean: - @rm -rf package - @rm -rf *.deb - @rm -rf patch-replacements - @rm -rf .package - -.PHONY: release -release: - ../tools/deb_unpack python-oslo.messaging_1.3.0-fuel5.1~mira4_all.deb $(ORIGISO) - @mkdir -p package/etc - @echo "Hello, world" > package/etc/hello.txt - ../tools/deb_pack $(REVSTATE) - @cp *.deb ../release/packages - @cat patch-replacements >> ../release/patch-replacements -- cgit 1.2.3-korg