Permalink
Browse files

SLES 11

	bootstrap
		Fix some diffs for 12 vs 11

	manifest
		Manifest files can now have -package to disable
		the package from the manifest-check

		manifest-check also looks for .manifest and .RELEASE
		files in manifest.d (e.g. common.sles11) this is
		how we turn off packages for sles11

	order-stacki-sles11.mk
		Use relative paths (doh)

	3rdparty
		Sort the file list that does into the .md file so we
		don't commit crap just because the random ordering
		changed.

	Added some more of our python code to the sles11 build because
	I can and it takes no time to build.
  • Loading branch information...
root
root committed Nov 17, 2017
1 parent 9187ab7 commit 2c9b5b519fddd7656c4ded4208b292cf091f9725
View
@@ -5,6 +5,7 @@
# @copyright@
OS=$(shell common/src/stack/build/build/bin/os)
RELEASE=$(shell common/src/stack/build/build/bin/os-release)
ROLLROOT = .
@@ -21,7 +22,7 @@ endif
cd sles && $(ROLLSBUILD)/bin/get3rdparty.py
bootstrap-make:
$(MAKE) -C $(OS) -f bootstrap.mk bootstrap
$(MAKE) -C $(OS) -f bootstrap.mk RELEASE=$(RELEASE) bootstrap
$(MAKE) -C common/src/stack/build bootstrap
bootstrap: bootstrap-make
View
@@ -3,14 +3,14 @@
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.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]
* Python-3.6.1.tgz [https://teradata-stacki.s3.amazonaws.com/3rdparty/Python-3.6.1.tgz]
* gd-2.0.33.tar.gz [https://teradata-stacki.s3.amazonaws.com/3rdparty/gd-2.0.33.tar.gz]
* rcs-5.7.tar.gz [https://teradata-stacki.s3.amazonaws.com/3rdparty/rcs-5.7.tar.gz]
* mariadb-10.2.6.tar.gz [https://teradata-stacki.s3.amazonaws.com/3rdparty/mariadb-10.2.6.tar.gz]
* zeromq-4.2.2.tar.gz [https://teradata-stacki.s3.amazonaws.com/3rdparty/zeromq-4.2.2.tar.gz]
* sc-im-0.4.0-20161021.tgz [https://teradata-stacki.s3.amazonaws.com/3rdparty/sc-im-0.4.0-20161021.tgz]
* Python-3.6.1.tgz [https://teradata-stacki.s3.amazonaws.com/3rdparty/Python-3.6.1.tgz]
* newt-0.52.20.tar.gz [https://teradata-stacki.s3.amazonaws.com/3rdparty/newt-0.52.20.tar.gz]
* pycairo-1.15.3.tar.gz [https://teradata-stacki.s3.amazonaws.com/3rdparty/pycairo-1.15.3.tar.gz]
* rcs-5.7.tar.gz [https://teradata-stacki.s3.amazonaws.com/3rdparty/rcs-5.7.tar.gz]
* redis-4.0.2.tar.gz [https://teradata-stacki.s3.amazonaws.com/3rdparty/redis-4.0.2.tar.gz]
* sc-im-0.4.0-20161021.tgz [https://teradata-stacki.s3.amazonaws.com/3rdparty/sc-im-0.4.0-20161021.tgz]
* storcli-1.17.08-1.noarch.rpm [https://teradata-stacki.s3.amazonaws.com/3rdparty/storcli-1.17.08-1.noarch.rpm]
* wxPython-4.0.0a3.tar.gz [https://teradata-stacki.s3.amazonaws.com/3rdparty/wxPython-4.0.0a3.tar.gz]
* zeromq-4.2.2.tar.gz [https://teradata-stacki.s3.amazonaws.com/3rdparty/zeromq-4.2.2.tar.gz]
@@ -0,0 +1,20 @@
-foundation-comps
-foundation-fbtftpd
-foundation-gd
-foundation-mariadb
-foundation-newt
-foundation-py-pycairo
-foundation-py-wxPython
-foundation-redis
-sc-im
-stack-admin
-stack-config-server
-stack-ekv
-stack-examples
-stack-kickstart
-stack-pxeboot
-stack-sql
-stack-summary
-stack-wizard
-stack-ws
-stack-ws-client
@@ -0,0 +1 @@
-foundation-python-mod-wsgi
@@ -1,15 +1,17 @@
SRCDIRS=/state/partition1/stacki/common/src/stack/build \
/state/partition1/stacki/common/src/foundation/python \
/state/partition1/stacki/common/src/stack/config \
/state/partition1/stacki/common/src/foundation/python-packages \
/state/partition1/stacki/common/src/foundation/MegaCLI \
/state/partition1/stacki/common/src/foundation/StorCLI \
/state/partition1/stacki/common/src/foundation/fio \
/state/partition1/stacki/common/src/foundation/iperf \
/state/partition1/stacki/common/src/foundation/rcs \
/state/partition1/stacki/common/src/foundation/stream \
/state/partition1/stacki/common/src/stack/ludicrous-speed \
/state/partition1/stacki/common/src/stack/mq \
/state/partition1/stacki/common/src/stack/storage-config \
/state/partition1/stacki/common/src/stack/uefi-boot-method \
/state/partition1/stacki/common/src/foundation/zeromq
SRCDIRS=stack/build \
foundation/python \
stack/config \
stack/command \
stack/pylib \
foundation/python-packages \
foundation/MegaCLI \
foundation/StorCLI \
foundation/fio \
foundation/iperf \
foundation/rcs \
foundation/stream \
stack/ludicrous-speed \
stack/mq \
stack/storage-config \
stack/uefi-boot-method \
foundation/zeromq
@@ -17,7 +17,7 @@
resources = { }
if not os.path.exists(manifest):
print('Cannot file manifest.3rdparty file')
print('no manifest.3rdparty found')
sys.exit(0)
if not os.path.exists(cachedir):
@@ -43,7 +43,7 @@
This repository includes the following code from other projects.
""")
for resource in resources:
for resource in sorted(resources.keys()):
fout.write('* %s [%s]\n' % (resource, resources[resource]))
fout.close()
@@ -32,6 +32,11 @@
except:
secondary = None
try:
release = sys.argv[4]
except:
release = None
tree = stack.file.Tree(os.getcwd())
builtfiles = []
@@ -42,7 +47,6 @@
# print('found %d files' % len(found))
builtfiles += found
manifest = []
manifests = [ ]
search = [ 'common', '.' ]
if secondary:
@@ -59,9 +63,11 @@
name, ext = os.path.splitext(filename)
if ext == '.manifest':
manifests.append(os.path.join(dirname, filename))
elif release and ext == '.%s' % release:
manifests.append(os.path.join(dirname, filename))
found = False
packages = { }
found = False
for filename in manifests:
print('reading %s' % filename)
found = True
@@ -70,10 +76,17 @@
l = line.strip()
if len(l) == 0 or (len(l) > 0 and l[0] == '#'):
continue
if l not in manifest: # ignore duplicates
manifest.append(l)
if l[0] == '-': # use '-package' to turn off the check
packages[l[1:]] = False
elif l not in packages:
packages[l] = True
file.close()
manifest = [ ]
for pkg in packages:
if packages[pkg]:
manifest.append(pkg)
if not found:
print('Cannot find any manifest files')
sys.exit(0)
@@ -25,6 +25,6 @@ nuke.all:: nuke
.PHONY: manifest-check
manifest-check:
$(ROLLSBUILD)/bin/manifest-check.py $(ROLL) build-$(ROLL)-$(STACK) $(OS)
$(ROLLSBUILD)/bin/manifest-check.py $(ROLL) build-$(ROLL)-$(STACK) $(OS) $(RELEASE)
endif # __CCROLLS_MK
View
@@ -3,5 +3,5 @@
This repository includes the following code from other projects.
* foundation-python-3.6.1-sles11.x86_64.rpm [https://teradata-stacki.s3.amazonaws.com/3rdparty/foundation-python-3.6.1-sles11.x86_64.rpm]
* parted-2.3-10.45.1.x86_64.rpm [https://teradata-stacki.s3.amazonaws.com/3rdparty/parted-2.3-10.45.1.x86_64.rpm]
* foundation-python-packages-5.0-sles11.x86_64.rpm [https://teradata-stacki.s3.amazonaws.com/3rdparty/foundation-python-packages-5.0-sles11.x86_64.rpm]
* parted-2.3-10.45.1.x86_64.rpm [https://teradata-stacki.s3.amazonaws.com/3rdparty/parted-2.3-10.45.1.x86_64.rpm]
View
@@ -4,13 +4,19 @@
# https://github.com/Teradata/stacki/blob/master/LICENSE.txt
# @copyright@
PKGLIST= rpm-build libzip2 apache2 squashfs apache2-devel createrepo cdrkit-cdrtools-compat
PKGLIST = apache2 squashfs apache2-devel createrepo cdrkit-cdrtools-compat
PATLIST = 32bit Basis-Devel
ifeq ($(RELEASE), sles11)
PKGLIST += brp-check-suse
ifeq ($(RELEASE),sles12)
PKGLIST += rpm-build libzip2
PATLIST += SDK-C-C++
endif
ifeq ($(RELEASE),sles11)
PKGLIST += libzip1 brp-check-suse
endif
bootstrap:
../common/src/stack/build/build/bin/package-install -m 32bit Basis-Devel SDK-C-C++
../common/src/stack/build/build/bin/package-install -m $(PATLIST)
../common/src/stack/build/build/bin/package-install $(PKGLIST)
File renamed without changes.
@@ -0,0 +1 @@
-stack-sles-images

0 comments on commit 2c9b5b5

Please sign in to comment.