... | ... |
@@ -18,6 +18,12 @@ else |
18 | 18 |
PHOTON_SOURCES := sources |
19 | 19 |
endif |
20 | 20 |
|
21 |
+ifdef PHOTON_PUBLISH_RPMS_PATH |
|
22 |
+PHOTON_PUBLISH_RPMS := publish-rpms-cached |
|
23 |
+else |
|
24 |
+PHOTON_PUBLISH_RPMS := publish-rpms |
|
25 |
+endif |
|
26 |
+ |
|
21 | 27 |
.PHONY : all iso clean toolchain toolchain-minimal photon-build-machine photon-vagrant-build photon-vagrant-local \ |
22 | 28 |
check check-bison check-g++ check-gawk check-createrepo check-vagrant check-packer check-packer-ovf-plugin |
23 | 29 |
|
... | ... |
@@ -32,35 +38,36 @@ iso: check $(PHOTON_PACKAGES) $(PHOTON_TOOLCHAIN_MINIMAL) |
32 | 32 |
-f > \ |
33 | 33 |
$(PHOTON_LOGS_DIR)/installer.log 2>&1 |
34 | 34 |
|
35 |
-packages: check $(PHOTON_TOOLCHAIN_MINIMAL) $(PHOTON_SOURCES) |
|
35 |
+packages: check $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) |
|
36 | 36 |
@echo "Building all RPMS..." |
37 | 37 |
@cd $(PHOTON_PKG_BUILDER_DIR) && \ |
38 |
- $(PHOTON_PACKAGE_BUILDER) -a \ |
|
38 |
+ $(PHOTON_PACKAGE_BUILDER) -o full \ |
|
39 | 39 |
-s $(PHOTON_SPECS_DIR) \ |
40 | 40 |
-r $(PHOTON_RPMS_DIR) \ |
41 |
- -o $(PHOTON_SRCS_DIR) \ |
|
42 |
- -p $(PHOTON_STAGE) \ |
|
43 |
- -l $(PHOTON_LOGS_DIR) |
|
41 |
+ -x $(PHOTON_SRCS_DIR) \ |
|
42 |
+ -b $(PHOTON_STAGE) \ |
|
43 |
+ -l $(PHOTON_LOGS_DIR) \ |
|
44 |
+ -p $(PHOTON_PUBLISH_RPMS_DIR) |
|
44 | 45 |
|
45 |
-packages-cached: check $(PHOTON_TOOLCHAIN_MINIMAL) |
|
46 |
+packages-cached: |
|
46 | 47 |
@echo "Using cached RPMS..." |
47 | 48 |
@$(RM) -f $(PHOTON_RPMS_DIR_NOARCH)/* && \ |
48 | 49 |
$(RM) -f $(PHOTON_RPMS_DIR_X86_64)/* && \ |
49 | 50 |
$(CP) -f $(PHOTON_CACHE_PATH)/RPMS/noarch/* $(PHOTON_RPMS_DIR_NOARCH)/ && \ |
50 | 51 |
$(CP) -f $(PHOTON_CACHE_PATH)/RPMS/x86_64/* $(PHOTON_RPMS_DIR_X86_64)/ |
51 | 52 |
|
52 |
-%: check $(PHOTON_TOOLCHAIN_MINIMAL) $(PHOTON_SOURCES) |
|
53 |
+%: check $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) |
|
53 | 54 |
$(eval PKG_NAME = $@) |
54 | 55 |
@echo "Building package $(PKG_NAME) ..." |
55 | 56 |
@cd $(PHOTON_PKG_BUILDER_DIR) && \ |
56 |
- $(PHOTON_PACKAGE_BUILDER) -i \ |
|
57 |
+ $(PHOTON_PACKAGE_BUILDER) -i $(PKG_NAME)\ |
|
57 | 58 |
-b $(PHOTON_CHROOT_PATH) \ |
58 | 59 |
-s $(PHOTON_SPECS_DIR) \ |
59 | 60 |
-r $(PHOTON_RPMS_DIR) \ |
60 |
- -o $(PHOTON_SRCS_DIR) \ |
|
61 |
- -p $(PHOTON_STAGE) \ |
|
62 |
- -l $(PHOTON_LOGS_DIR) \ |
|
63 |
- $(PKG_NAME) |
|
61 |
+ -x $(PHOTON_SRCS_DIR) \ |
|
62 |
+ -p $(PHOTON_PUBLISH_RPMS_DIR) \ |
|
63 |
+ -l $(PHOTON_LOGS_DIR) |
|
64 |
+ |
|
64 | 65 |
|
65 | 66 |
sources: |
66 | 67 |
@echo "Pulling sources from bintray..." |
... | ... |
@@ -72,6 +79,16 @@ sources-cached: |
72 | 72 |
@$(MKDIR) -p $(PHOTON_SRCS_DIR) && \ |
73 | 73 |
$(CP) -rf $(PHOTON_SOURCES_PATH)/* $(PHOTON_SRCS_DIR)/ |
74 | 74 |
|
75 |
+publish-rpms: |
|
76 |
+ @echo "Pulling publish rpms from bintray..." |
|
77 |
+ @cd $(PHOTON_PULL_PUBLISH_RPMS_DIR) && \ |
|
78 |
+ $(PHOTON_PULL_PUBLISH_RPMS) $(PHOTON_PUBLISH_RPMS_DIR) |
|
79 |
+ |
|
80 |
+publish-rpms-cached: |
|
81 |
+ @echo "Using cached publish rpms..." |
|
82 |
+ @$(MKDIR) -p $(PHOTON_PUBLISH_RPMS_DIR) && \ |
|
83 |
+ $(CP) -rf $(PHOTON_PUBLISH_RPMS_PATH)/* $(PHOTON_PUBLISH_RPMS_DIR)/ |
|
84 |
+ |
|
75 | 85 |
toolchain-minimal : $(PHOTON_TOOLCHAIN_MINIMAL) |
76 | 86 |
|
77 | 87 |
$(PHOTON_TOOLCHAIN_MINIMAL) : $(PHOTON_TOOLCHAIN) $(PHOTON_TOOLCHAIN_MIN_LIST) |
... | ... |
@@ -30,12 +30,18 @@ PHOTON_LOGS_DIR=$(PHOTON_STAGE)/LOGS |
30 | 30 |
PHOTON_RPMS_DIR=$(PHOTON_STAGE)/RPMS |
31 | 31 |
PHOTON_SPECS_DIR=$(SRCROOT)/SPECS |
32 | 32 |
PHOTON_SRCS_DIR=$(PHOTON_STAGE)/SOURCES |
33 |
+PHOTON_PUBLISH_RPMS_DIR=$(PHOTON_STAGE)/PUBLISHRPMS |
|
34 |
+ |
|
33 | 35 |
PHOTON_PKG_BUILDER_DIR=$(SRCROOT)/support/package-builder |
34 | 36 |
PHOTON_PULL_SOURCES_DIR=$(SRCROOT)/support/pullsources |
37 |
+PHOTON_PULL_PUBLISH_RPMS_DIR=$(SRCROOT)/support/pullpublishrpms |
|
38 |
+ |
|
35 | 39 |
PHOTON_INSTALLER_DIR=$(SRCROOT)/installer |
36 | 40 |
PHOTON_INSTALLER=$(PHOTON_INSTALLER_DIR)/photonInstaller.py |
37 | 41 |
PHOTON_PACKAGE_BUILDER=$(PHOTON_PKG_BUILDER_DIR)/builder.py |
38 | 42 |
PHOTON_PULL_SOURCES=$(PHOTON_PULL_SOURCES_DIR)/pullsources.py |
43 |
+PHOTON_PULL_PUBLISH_RPMS=$(PHOTON_PULL_PUBLISH_RPMS_DIR)/pullpublishrpms.sh |
|
44 |
+ |
|
39 | 45 |
PHOTON_CHROOT_CLEANER=$(PHOTON_PKG_BUILDER_DIR)/cleanup-build-root.sh |
40 | 46 |
PHOTON_RPMS_DIR_NOARCH=$(PHOTON_RPMS_DIR)/noarch |
41 | 47 |
PHOTON_RPMS_DIR_X86_64=$(PHOTON_RPMS_DIR)/x86_64 |
42 | 48 |
new file mode 100755 |
... | ... |
@@ -0,0 +1,35 @@ |
0 |
+#!/bin/bash |
|
1 |
+################################################# |
|
2 |
+# Title: pullpublishrpms.sh # |
|
3 |
+# Date: 2015-06-06 # |
|
4 |
+# Version: 1.0 # |
|
5 |
+# Author: dthaluru@vmware.com # |
|
6 |
+################################################# |
|
7 |
+ |
|
8 |
+PRGNAME=${0##*/} |
|
9 |
+ |
|
10 |
+if [ $# -lt 1 ]; then |
|
11 |
+ echo "${PRGNAME}: No publish rpms path and log path are specified. Usage : ${PRGNAME} <publish-rpms-path>" |
|
12 |
+ exit 1 |
|
13 |
+fi |
|
14 |
+ |
|
15 |
+PUBLISHRPMSPATHDIR=$1 |
|
16 |
+ |
|
17 |
+if [ ${EUID} -ne 0 ]; then |
|
18 |
+ echo "${PRGNAME}: Need to be root user: FAILURE" |
|
19 |
+ exit 1 |
|
20 |
+fi |
|
21 |
+ |
|
22 |
+mkdir -p ${PUBLISHRPMSPATHDIR}/x86_64 |
|
23 |
+mkdir -p ${PUBLISHRPMSPATHDIR}/noarch |
|
24 |
+ |
|
25 |
+for line in $(cat rpmfilelist) |
|
26 |
+do |
|
27 |
+ echo $line |
|
28 |
+ subRPMpath="x86_64" |
|
29 |
+ if [ `echo $line | grep -c "noarch" ` -gt 0 ]; then |
|
30 |
+ subRPMpath="noarch" |
|
31 |
+ fi |
|
32 |
+ cmd= wget https://bintray.com/artifact/download/vmware/photon_release_1.0_TP1_x86_64/$line -P ${PUBLISHRPMSPATHDIR}/${subRPMpath} |
|
33 |
+ echo $cmd |
|
34 |
+done |
0 | 35 |
new file mode 100644 |
... | ... |
@@ -0,0 +1,77 @@ |
0 |
+x86_64/python2-devel-2.7.9-1.x86_64.rpm |
|
1 |
+x86_64/nss-devel-3.15.4-1.x86_64.rpm |
|
2 |
+noarch/google-startup-scripts-1.2.2-1.noarch.rpm |
|
3 |
+x86_64/libpipeline-1.2.6-1.x86_64.rpm |
|
4 |
+noarch/linux-api-headers-3.19.2-1.noarch.rpm |
|
5 |
+x86_64/expat-2.1.0-1.x86_64.rpm |
|
6 |
+x86_64/make-4.0-1.x86_64.rpm |
|
7 |
+x86_64/libstdc%2B%2B-4.8.2-1.x86_64.rpm |
|
8 |
+x86_64/sed-4.2.2-1.x86_64.rpm |
|
9 |
+x86_64/libgcc-4.8.2-1.x86_64.rpm |
|
10 |
+x86_64/findutils-4.4.2-1.x86_64.rpm |
|
11 |
+x86_64/file-5.22-1.x86_64.rpm |
|
12 |
+x86_64/popt-1.16-1.x86_64.rpm |
|
13 |
+x86_64/gdbm-1.11-1.x86_64.rpm |
|
14 |
+noarch/python-jsonpatch-1.9-1.noarch.rpm |
|
15 |
+x86_64/texinfo-5.2-1.x86_64.rpm |
|
16 |
+x86_64/glibc-devel-2.21-1.x86_64.rpm |
|
17 |
+x86_64/gcc-4.8.2-1.x86_64.rpm |
|
18 |
+x86_64/nss-3.15.4-1.x86_64.rpm |
|
19 |
+x86_64/gmp-devel-5.1.3-1.x86_64.rpm |
|
20 |
+x86_64/libgcc-devel-4.8.2-1.x86_64.rpm |
|
21 |
+x86_64/groff-1.22.2-1.x86_64.rpm |
|
22 |
+x86_64/libstdc%2B%2B-devel-4.8.2-1.x86_64.rpm |
|
23 |
+x86_64/lua-5.2.3-1.x86_64.rpm |
|
24 |
+x86_64/glibc-2.21-1.x86_64.rpm |
|
25 |
+x86_64/elfutils-libelf-devel-0.158-1.x86_64.rpm |
|
26 |
+x86_64/gettext-0.18.3.2-1.x86_64.rpm |
|
27 |
+noarch/perl-Config-IniFiles-2.83-1.noarch.rpm |
|
28 |
+x86_64/coreutils-8.22-1.x86_64.rpm |
|
29 |
+noarch/createrepo-0.10.3-1.noarch.rpm |
|
30 |
+x86_64/man-db-2.6.6-1.x86_64.rpm |
|
31 |
+x86_64/elfutils-libelf-0.158-1.x86_64.rpm |
|
32 |
+x86_64/python2-libs-2.7.9-1.x86_64.rpm |
|
33 |
+x86_64/m4-1.4.17-1.x86_64.rpm |
|
34 |
+x86_64/gmp-5.1.3-1.x86_64.rpm |
|
35 |
+x86_64/mpfr-devel-3.1.2-1.x86_64.rpm |
|
36 |
+x86_64/xz-5.0.5-1.x86_64.rpm |
|
37 |
+x86_64/procps-ng-3.3.9-1.x86_64.rpm |
|
38 |
+x86_64/flex-2.5.38-1.x86_64.rpm |
|
39 |
+x86_64/lua-devel-5.2.3-1.x86_64.rpm |
|
40 |
+x86_64/popt-devel-1.16-1.x86_64.rpm |
|
41 |
+x86_64/mpc-1.0.2-1.x86_64.rpm |
|
42 |
+x86_64/ncurses-devel-5.9-1.x86_64.rpm |
|
43 |
+x86_64/ncurses-5.9-1.x86_64.rpm |
|
44 |
+x86_64/bzip2-1.0.6-1.x86_64.rpm |
|
45 |
+x86_64/gawk-4.1.0-1.x86_64.rpm |
|
46 |
+x86_64/cpio-2.11-1.x86_64.rpm |
|
47 |
+x86_64/libtool-2.4.2-1.x86_64.rpm |
|
48 |
+x86_64/sqlite-autoconf-3080301-1.x86_64.rpm |
|
49 |
+x86_64/libffi-3.1-1.x86_64.rpm |
|
50 |
+x86_64/openssl-devel-1.0.2a-1.x86_64.rpm |
|
51 |
+x86_64/readline-6.3-1.x86_64.rpm |
|
52 |
+x86_64/util-linux-2.24.1-1.x86_64.rpm |
|
53 |
+x86_64/elfutils-devel-0.158-1.x86_64.rpm |
|
54 |
+x86_64/bash-4.3-1.x86_64.rpm |
|
55 |
+x86_64/python2-2.7.9-1.x86_64.rpm |
|
56 |
+x86_64/zlib-devel-1.2.8-1.x86_64.rpm |
|
57 |
+x86_64/binutils-devel-2.25-1.x86_64.rpm |
|
58 |
+x86_64/autoconf-2.69-1.x86_64.rpm |
|
59 |
+x86_64/grep-2.21-1.x86_64.rpm |
|
60 |
+x86_64/readline-devel-6.3-1.x86_64.rpm |
|
61 |
+x86_64/nspr-4.10.3-1.x86_64.rpm |
|
62 |
+x86_64/diffutils-3.3-1.x86_64.rpm |
|
63 |
+x86_64/zlib-1.2.8-1.x86_64.rpm |
|
64 |
+x86_64/elfutils-0.158-1.x86_64.rpm |
|
65 |
+x86_64/openssl-1.0.2a-1.x86_64.rpm |
|
66 |
+x86_64/libgomp-4.8.2-1.x86_64.rpm |
|
67 |
+x86_64/libgomp-devel-4.8.2-1.x86_64.rpm |
|
68 |
+x86_64/bison-3.0.2-1.x86_64.rpm |
|
69 |
+x86_64/bzip2-devel-1.0.6-1.x86_64.rpm |
|
70 |
+x86_64/gzip-1.6-1.x86_64.rpm |
|
71 |
+noarch/man-pages-3.59-1.noarch.rpm |
|
72 |
+x86_64/mpfr-3.1.2-1.x86_64.rpm |
|
73 |
+x86_64/automake-1.14.1-1.x86_64.rpm |
|
74 |
+x86_64/binutils-2.25-1.x86_64.rpm |
|
75 |
+x86_64/pkg-config-0.28-1.x86_64.rpm |
|
76 |
+ |