Permalink
Browse files

testing pip stuff on sles, and bootstrapping

  • Loading branch information...
masonkatz committed Oct 11, 2017
1 parent 4a99c1f commit 89d81f4ae626a83a810e42b41f2907ca74658c77
View
@@ -12,11 +12,10 @@ ROLLROOT = .
3rdparty:
$(ROLLSBUILD)/bin/get3rdparty.py
bootstrap::
-yum group install -y "Development Tools"
-yum group install -y "Infrastructure Server"
-yum install -y createrepo genisoimage git emacs vim
bootstrap:
$(MAKE) -C ../common $@
$(STACKBUILD)/bin/package-install -m "Development Tools" "Infrastructure Server"
$(STACKBUILD)/bin/package-install createrepo genisoimage git emacs vim
$(MAKE) 3rdparty
$(MAKE) -C src bootstrap
@@ -28,7 +27,7 @@ preroll::
mkdir -p build-$(ROLL)-$(STACK)/manifest.d
for d in RPMS manifest.d; do cp -r ../common/build-$(ROLL)-$(STACK)/$$d/* build-$(ROLL)-$(STACK)/$$d/; done
for x in graph nodes; do cp -r ../common/build-$(ROLL)-$(STACK)/$$x/*.xml build-$(ROLL)-$(STACK)/$$x/; done
cp ../common/manifest ../common/build-$(ROLL)-$(STACK)/manifest.d/common.manifest
cp ../common/manifest build-$(ROLL)-$(STACK)/manifest.d/common.manifest
@@ -1,2 +1 @@
#ANACONDA_VERSION = 7.1611
ANACONDA_VERSION = 7.1708
@@ -10,8 +10,21 @@ include $(STACKBUILD)/etc/CCRules.mk
-include $(RELEASE).mk
-include $(RELEASE)-$(ARCH).mk
bootstrap::
yum install -y $(OS.DEPENDENCIES)
BOOTSTRAP = NetworkManager-devel \
NetworkManager-glib-devel \
libnl-devel \
device-mapper-devel \
rpm-devel \
libarchive-devel \
isomd5sum-devel \
e2fsprogs-devel \
iscsi-initiator-utils-devel \
newt-devel \
squashfs-tools
bootstrap:
$(STACKBUILD)/bin/package-install $(BOOTSTRAP)
deploy: install-rpm
cp /opt/stack/images/initrd* /tftpboot/pxelinux/
@@ -1,13 +1,2 @@
MAKE.rpmflag = -bb --define "__spec_install_post :"
OS.DEPENDENCIES = NetworkManager-devel \
NetworkManager-glib-devel \
libnl-devel \
device-mapper-devel \
rpm-devel \
libarchive-devel \
isomd5sum-devel \
e2fsprogs-devel \
iscsi-initiator-utils-devel \
newt-devel \
squashfs-tools
MAKE.rpmflag = -bb --define "__spec_install_post :"
ORDER = 99
View
@@ -4,7 +4,7 @@ This repository includes the following code from other projects.
* MegaCli-8.07.07-1.noarch.rpm [https://teradata-stacki.s3.amazonaws.com/3rdparty/MegaCli-8.07.07-1.noarch.rpm]
* storcli-1.17.08-1.noarch.rpm [https://teradata-stacki.s3.amazonaws.com/3rdparty/storcli-1.17.08-1.noarch.rpm]
* pycairo-1.2.0.tar.gz [https://teradata-stacki.s3.amazonaws.com/3rdparty/pycairo-1.2.0.tar.gz]
* pycairo-1.15.3.tar.gz [https://teradata-stacki.s3.amazonaws.com/3rdparty/pycairo-1.15.3.tar.gz]
* wxPython-4.0.0a3.tar.gz [https://teradata-stacki.s3.amazonaws.com/3rdparty/wxPython-4.0.0a3.tar.gz]
* git-lfs-1.4.3-1.el7.x86_64.rpm [https://teradata-stacki.s3.amazonaws.com/3rdparty/git-lfs-1.4.3-1.el7.x86_64.rpm]
* gd-2.0.33.tar.gz [https://teradata-stacki.s3.amazonaws.com/3rdparty/gd-2.0.33.tar.gz]
View
@@ -10,7 +10,6 @@ foundation-python
foundation-rcs
foundation-redis
foundation-zeromq
git-lfs
ludicrous-speed
sc-im
stack-admin
@@ -29,3 +28,4 @@ stack-storage-config
stack-summary
stack-wizard
storcli
uefi-boot-method
View
@@ -3,7 +3,7 @@ git-lfs-1.4.3-1.el6.x86_64.rpm
git-lfs-1.4.3-1.el7.x86_64.rpm
MegaCli-8.07.07-1.noarch.rpm
newt-0.52.20.tar.gz
pycairo-1.2.0.tar.gz
pycairo-1.15.3.tar.gz
Python-3.6.1.tgz
rcs-5.7.tar.gz
sc-im-0.4.0-20161021.tgz
@@ -19,8 +19,10 @@ DEPENDS.FILES = mariadb-$(VERSION).tar.gz
include $(STACKBUILD)/etc/CCRules.mk
bootstrap-redhat::
yum install -y cmake systemd-devel
BOOTSTRAP = cmake systemd-devel
bootstrap:
$(STACKBUILD)/bin/package-install $(BOOTSTRAP)
build:
gunzip -c mariadb-$(VERSION).tar.gz | $(TAR) -xf -
@@ -10,10 +10,11 @@ DEPENDS.FILES = newt-$(VERSION).tar.gz
include $(STACKBUILD)/etc/CCRules.mk
bootstrap-redhat::
yum install -y slang-devel popt-devel
BOOTSTRAP = slang-devel popt-devel
bootstrap:: install-rpm
bootstrap:
$(STACKBUILD)/bin/package-install $(BOOTSTRAP)
$(MAKE) install-rpm
build:
tar -xzf newt-$(VERSION).tar.gz
@@ -19,17 +19,15 @@ include $(STACKBUILD)/etc/CCRules.mk
build:
gunzip -c pycairo-$(VERSION).tar.gz | $(TAR) -xf -
( \
( \
cd pycairo-$(VERSION); \
PATH=/opt/stack/bin:$$PATH \
./configure --prefix=$(PKGROOT); \
$(MAKE); \
$(PY.PATH) setup.py build; \
)
install::
( \
( \
cd pycairo-$(VERSION); \
$(MAKE) prefix=$(ROOT)/$(PKGROOT) install; \
$(PY.PATH) setup.py install --root=$(ROOT); \
)

This file was deleted.

Oops, something went wrong.
@@ -1 +1 @@
VERSION = 1.2.0
VERSION = 1.15.3
@@ -9,8 +9,12 @@ ROLLROOT = ../../..
include $(STACKBUILD)/etc/CCRules.mk
bootstrap-redhat::
yum install -y webkitgtk3-devel gtk3-devel gstreamer-devel popt-devel gstreamer1-devel GConf2-devel gstreamer-python-devel gstreamer1-plugins-base-devel mesa-libGLU-devel
BOOTSTRAP = gtk3-devel gstreamer-devel
BOOTSTRAP.redhat = webkitgtk3-devel popt-devel gstreamer1-devel GConf2-devel gstreamer-python-devel gstreamer1-plugins-base-devel mesa-libGLU-devel
BOOTSTRAP.suse = freeglut-devel gstreamer-plugins-base-devel webkit2gtk3-devel libwebkitgtk3-devel
bootstrap:
$(STACKBUILD)/bin/package-install $(BOOTSTRAP) $(BOOTSTRAP.$(OS))
build:
tar -xzf wxPython-$(VERSION).tar.gz
@@ -10,9 +10,7 @@ RPM.STRATEGY = custom
include $(STACKBUILD)/etc/CCRules.mk
rpm: src
for x in src/*; do $(MAKE) -C $$x $@; done
bootstrap:: src
bootstrap rpm: src
for x in src/*; do $(MAKE) -C $$x $@; done
refresh:
@@ -10,18 +10,19 @@ DEPENDS.FILES = Python-$(VERSION).tgz
include $(STACKBUILD)/etc/CCRules.mk
bootstrap-redhat::
yum install -y openssl-devel readline-devel bz2-devel xz-devel
echo $(PKGROOT)/lib > /etc/ld.so.conf.d/stacki-python.conf
BOOTSTRAP = readline-devel
BOOTSTRAP.redhat = openssl-devel bz2-devel xz-devel
BOOTSTRAP.suse =
bootstrap:: install-rpm
bootstrap:
$(STACKBUILD)/bin/package-install $(BOOTSTRAP) $(BOOTSTRAP.$(OS))
$(MAKE) install-rpm
echo $(PKGROOT)/lib > /etc/ld.so.conf.d/stacki-python.conf
ldconfig
build:
tar -xzf Python-$(VERSION).tgz
# -cd patch-files && find . -type f | grep -v CVS | cpio -pduv ../
( \
cd Python-$(VERSION); \
./configure --prefix=$(PKGROOT) \
@@ -10,7 +10,14 @@ ROLLROOT = ../../..
DEPENDS.FILES = $(NAME)-$(VERSION)-$(RELEASE).tgz
include $(STACKBUILD)/etc/CCRules.mk
-include build-$(OS).mk
bootstrap:
ifeq ($($OS),suse)
echo "Name: ncursesw" > /usr/lib64/pkgconfig/ncursesw.pc
echo "Description: Old school GUI" >> /usr/lib64/pkgconfig/ncursesw.pc
echo "Version: 5.9-40" >> /usr/lib64/pkgconfig/ncursesw.pc
echo "Libs: -lncursesw" >> /usr/lib64/pkgconfig/ncursesw.pc
endif
refresh:

This file was deleted.

Oops, something went wrong.
@@ -1,52 +1,15 @@
# @SI_Copyright@
# stacki.com
# v4.0
#
# Copyright (c) 2006 - 2017 StackIQ Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
#
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#
# 2. Redistributions in binary form must reproduce the above copyright
# notice unmodified and in its entirety, this list of conditions and the
# following disclaimer in the documentation and/or other materials provided
# with the distribution.
#
# 3. All advertising and press materials, printed or electronic, mentioning
# features or use of this software must display the following acknowledgement:
#
# "This product includes software developed by StackIQ"
#
# 4. Except as permitted for the purposes of acknowledgment in paragraph 3,
# neither the name or logo of this software nor the names of its
# authors may be used to endorse or promote products derived from this
# software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY STACKIQ AND CONTRIBUTORS ``AS IS''
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL STACKIQ OR CONTRIBUTORS
# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# @SI_Copyright@
# @copyright@
# @copyright@
#
ROLLROOT = ../../..
include $(STACKBUILD)/etc/CCRules.mk
PKGROOT=/opt/stack
DEPENDS.FILES=$(ARCHIVENAME)-$(VERSION).tar.gz
bootstrap:: install-rpm
include $(STACKBUILD)/etc/CCRules.mk
bootstrap: install-rpm
build:
tar xzf $(ARCHIVENAME)-$(VERSION).tar.gz
@@ -66,4 +29,3 @@ install::
clean::
rm -rf $(ARCHIVENAME)-$(VERSION)
@@ -19,7 +19,7 @@ DEPENDS.RPMS =
include $(STACKBUILD)/etc/CCRules.mk
bootstrap:: install-rpm
bootstrap: install-rpm
build:
@@ -0,0 +1,40 @@
#!/bin/bash
#
# @copyright@
# @copyright@
zypper() {
for p in $@; do
if [ $meta == 1 ]; then
/usr/bin/zypper in -y -t pattern $p
else
/usr/bin/zypper in -y $p
fi
done
}
meta=0
while getopts "m" opt; do
case $opt in
m)
meta=1
;;
?)
echo 'invalid option'
exit -1
;;
esac
done
shift $(($OPTIND - 1))
case `$STACKBUILD/bin/os` in
suse)
zypper $@
;;
redhat)
yum $@
;;
esac
exit 0
@@ -159,7 +159,7 @@ install::
$(PY.PATH) -mpip install -I --no-deps --root=$(ROOT) %s==$(VERSION)
""" % package.name)
if package.bootstrap:
makefile.write('\nbootstrap:: install-rpm\n')
makefile.write('\nbootstrap: install-rpm\n')
with open(os.path.join(srcdir, 'version.mk'), 'w') as ver:
ver.write('NAME=%s-%s\n' % (Prefix, package.name))
@@ -287,13 +287,6 @@ clean::
printf "\n"; \
}' > $@
# --------------------------------------------------------------------- #
# Bootstrap
# --------------------------------------------------------------------- #
bootstrap-$(OS)::
bootstrap:: bootstrap-$(OS)
# --------------------------------------------------------------------- #
# Build the XML config file
# --------------------------------------------------------------------- #
@@ -18,7 +18,7 @@ PY.TEST.FLAGS = -s
include $(STACKBUILD)/etc/CCRules.mk
bootstrap:: install-rpm
bootstrap: install-rpm
doc:
$(STACKBUILD)/src/pallet/etc/doc/genrcldocs stacki markdoc
@@ -95,6 +95,8 @@ def copyXMLs(self, osname, name, version, release, arch):
for xml in [ 'graph', 'nodes' ]:
os.makedirs(os.path.join(dst, xml))
for src in [ xml, os.path.join('..', xml) ]:
if not os.path.exists(src):
continue
for filename in os.listdir(src):
base, ext = os.path.splitext(filename)
if ext == '.xml':
@@ -16,7 +16,7 @@ STACKBUILD = $(ROLLROOT)/src/stack/build/build
include $(STACKBUILD)/etc/CCRules.mk
bootstrap:: install-rpm
bootstrap: install-rpm
build:
Oops, something went wrong.

0 comments on commit 89d81f4

Please sign in to comment.