@@ -341,6 +341,7 @@ generate-dep-lists:

 	done

 docker-image:

+	sudo docker build --no-cache --tag photon-build ./support/dockerfiles/photon

 	sudo docker run \

 		-it \

 		--rm \

@@ -349,7 +350,7 @@ docker-image:

 		-e PHOTON_BUILD_NUMBER=$(PHOTON_BUILD_NUMBER) \

 		-e PHOTON_RELEASE_VERSION=$(PHOTON_RELEASE_VERSION) \

 		-v `pwd`:/workspace \

-		vmware/build-photon \

+		photon-build \

 		./support/dockerfiles/photon/make-docker-image.sh tdnf

 install-docker-image: docker-image

@@ -1,12 +1,12 @@

 Summary:	Photon release files

 Name:		photon-release

 Version:	1.0

-Release:	3%{?dist}

+Release:	4%{?dist}

 License:	Apache License

 Group:		System Environment/Base

 URL:		https://vmware.github.io/photon/

-Source:		%{name}-%{version}.2.tar.gz

-%define sha1 photon-release=4c03ec658315e25873e5e5f3e77c0006ddfeecc6

+Source:		%{name}-%{version}.4.tar.gz

+%define sha1 photon-release=d67b149f28117f1ad30acb585f180f8fa951f679

 Vendor:		VMware, Inc.

 Distribution:	Photon

 Provides:	photon-release

@@ -17,7 +17,7 @@ Requires:       rpm

 Photon release files such as yum configs and other /etc/ release related files

 %prep

-%setup -q -n %{name}-%{version}.2

+%setup -q -n %{name}-%{version}.4

 %build

@@ -25,13 +25,6 @@ Photon release files such as yum configs and other /etc/ release related files

 rm -rf $RPM_BUILD_ROOT

 install -d $RPM_BUILD_ROOT/etc

 install -d $RPM_BUILD_ROOT/usr/lib

-install -d -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d

-for file in *repo ; do

-  install -m 644 $file $RPM_BUILD_ROOT/etc/yum.repos.d

-done

-

-install -d -m 755 $RPM_BUILD_ROOT/etc/pki/rpm-gpg

-install -m 644 VMWARE-RPM-GPG-KEY $RPM_BUILD_ROOT/etc/pki/rpm-gpg

 echo "VMware Photon Linux %{photon_release_version}" > %{buildroot}/etc/photon-release

 echo "PHOTON_BUILD_NUMBER=%{photon_build_number}" >> %{buildroot}/etc/photon-release

@@ -66,22 +59,12 @@ Welcome to Photon 1.0 (x86_64) - Kernel %r (%t)

 EOF

 %post

-# Remove __db* files to workaround BD version check bug in rpm

-rm -f /var/lib/rpm/__db*

-rpm --import /etc/pki/rpm-gpg/VMWARE-RPM-GPG-KEY

 %clean

 rm -rf $RPM_BUILD_ROOT

 %files

 %defattr(-,root,root,-)

-%dir /etc/yum.repos.d

-/etc/pki/rpm-gpg/VMWARE-RPM-GPG-KEY

-%config(noreplace) /etc/yum.repos.d/photon-iso.repo

-%config(noreplace) /etc/yum.repos.d/photon.repo

-%config(noreplace) /etc/yum.repos.d/photon-updates.repo

-%config(noreplace) /etc/yum.repos.d/lightwave.repo

-%config(noreplace) /etc/yum.repos.d/photon-extras.repo

 %config(noreplace) /etc/photon-release

 %config(noreplace) /etc/lsb-release

 %config(noreplace) /usr/lib/os-release

@@ -90,9 +73,11 @@ rm -rf $RPM_BUILD_ROOT

 %config(noreplace) /etc/issue.net

 %changelog

+*       Mon Apr 11 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.0-4

+-       Split up repo and gpg key files to photon-repos

 *  		Thu Mar 24 2016 Xiaolin Li <xiaolinl@vmware.com> 1.0-3

 -		yum repo gpgkey to VMWARE-RPM-GPG-KEY.

-*  		Tue Mar 23 2016 Xiaolin Li <xiaolinl@vmware.com> 1.0-2

+*  		Wed Mar 23 2016 Xiaolin Li <xiaolinl@vmware.com> 1.0-2

 -		Add revision to photon-release

 *       Mon Jan 11 2016 Anish Swaminathan <anishs@vmware.com> 1.0-1

 -       Reset version to match with Photon version

new file mode 100644

@@ -0,0 +1,51 @@

+Summary:	Photon repo files, gpg keys

+Name:		photon-repos

+Version:	1.0

+Release:	1%{?dist}

+License:	Apache License

+Group:		System Environment/Base

+URL:		https://vmware.github.io/photon/

+Source:		%{name}-%{version}.tar.gz

+%define sha1 photon-repos=0be4c46922ad6f990e28e05fef75e2d1341aaf4a

+Vendor:		VMware, Inc.

+Distribution:	Photon

+Provides:	photon-repos

+BuildArch:	noarch

+Requires:       rpm

+

+%description

+Photon repo files and gpg keys 

+

+%prep

+%setup -q -n %{name}-%{version}

+

+%build

+

+%install

+rm -rf $RPM_BUILD_ROOT

+install -d -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d

+for file in *repo ; do

+  install -m 644 $file $RPM_BUILD_ROOT/etc/yum.repos.d

+done

+

+install -d -m 755 $RPM_BUILD_ROOT/etc/pki/rpm-gpg

+install -m 644 VMWARE-RPM-GPG-KEY $RPM_BUILD_ROOT/etc/pki/rpm-gpg

+

+%post

+

+%clean

+rm -rf $RPM_BUILD_ROOT

+

+%files

+%defattr(-,root,root,-)

+%dir /etc/yum.repos.d

+/etc/pki/rpm-gpg/VMWARE-RPM-GPG-KEY

+%config(noreplace) /etc/yum.repos.d/photon-iso.repo

+%config(noreplace) /etc/yum.repos.d/photon.repo

+%config(noreplace) /etc/yum.repos.d/photon-updates.repo

+%config(noreplace) /etc/yum.repos.d/lightwave.repo

+%config(noreplace) /etc/yum.repos.d/photon-extras.repo

+

+%changelog

+*       Mon Apr 11 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.0-1

+-       Initial

@@ -36,6 +36,7 @@

         "python-curses",

         "python-xml",

         "photon-release",

+        "photon-repos",

         "sed",

         "grep",

         "lsof",

@@ -8,7 +8,7 @@

                 "linux", 

                 "iptables", "ca-certificates",

                 "dbus", "docker",

-                "photon-release"

+                "photon-release", "photon-repos"

                 ]

 }

@@ -4,7 +4,7 @@

                 "findutils", "xz", "iproute2", "util-linux", "kmod", "linux", "ca-certificates", "curl", "iptables", "Linux-PAM",

                 "systemd", "dbus", "file", "e2fsprogs", "rpm",

                 "openssh", "gdbm", "python2", "python2-libs", "python-xml", 

-                "photon-release",

+                "photon-release", "photon-repos",

                 "sed", "grep", "cpio", "gzip", "vim", "db", "tdnf",

                 "open-vm-tools",

                 "docker","bridge-utils",

@@ -4,7 +4,7 @@

                 "findutils", "xz", "iproute2", "util-linux", "kmod", "linux-esx", "ca-certificates", "curl", "iptables", "Linux-PAM",

                 "systemd", "dbus", "file", "e2fsprogs", "rpm",

                 "openssh", "gdbm", "python2", "python2-libs", "python-xml",

-                "photon-release",

+                "photon-release", "photon-repos",

                 "sed", "grep", "cpio", "gzip", "vim", "db", "tdnf",

                 "open-vm-tools",

                 "docker","bridge-utils",

@@ -38,7 +38,8 @@ cd ${BUILDROOT} || fail "${PRGNAME}: Change directory: ${BUILDROOT}: FAILURE"

 if [[	$# -gt 0 ]] && [[ $1 == 'install' ]]; then

 	mkdir -p ${BUILDROOT}/var/lib/rpm

 	rpm   --root ${BUILDROOT} --initdb

-    tdnf install filesystem --installroot ${BUILDROOT} --nogpgcheck --assumeyes

+    tdnf install filesystem photon-repos --installroot ${BUILDROOT} --nogpgcheck --assumeyes

+    rpm --root ${BUILDROOT} --import ${BUILDROOT}/etc/pki/rpm-gpg/VMWARE-RPM-GPG-KEY

 else

 	RPMPKG="$(find RPMS -name 'filesystem-[0-9]*.rpm' -print)"

 	[ -z ${RPMPKG} ] && fail "	Filesystem rpm package missing: Can not continue"

new file mode 100644

@@ -0,0 +1,9 @@

+#

+# Ubuntu-Dev Dockerfile for building Linux Distribution.

+#

+

+FROM vmware/photon:latest

+

+WORKDIR /workspace

+

+CMD ["bash"]

@@ -17,17 +17,9 @@ TEMP_CHROOT=$(pwd)/temp_chroot

 ROOTFS_TAR_FILENAME=photon-rootfs-$PHOTON_RELEASE_VERSION-$PHOTON_BUILD_NUMBER.tar.bz2

 STAGE_DIR=$(pwd)/stage

-sudo createrepo $STAGE_DIR/RPMS

+rm -rf /etc/yum.repos.d/*

-cat > yum.conf <<- EOF

-

-[main]

-cachedir=$(pwd)/temp_chroot/var/cache/yum

-keepcache=1

-debuglevel=2

-logfile=$(pwd)/temp_chroot/var/log/yum.log

-exactarch=1

-obsoletes=1

+cat > /etc/yum.repos.d/photon-local.repo <<- EOF

 [photon-local]

 name=VMware Photon Linux 1.0(x86_64)

@@ -42,42 +34,21 @@ EOF

 rm -rf $TEMP_CHROOT 

 mkdir $TEMP_CHROOT

-# use host's yum to install in chroot

-mkdir -p $TEMP_CHROOT/var/lib/rpm

 rpm --root $TEMP_CHROOT/ --initdb

-yum -c yum.conf --disablerepo=* --enablerepo=photon-local --installroot=$TEMP_CHROOT install -y filesystem glibc

-yum -c yum.conf --disablerepo=* --enablerepo=photon-local --installroot=$TEMP_CHROOT install -y tdnf vim bash coreutils photon-release $MAIN_PACKAGE

-yum -c yum.conf --disablerepo=* --enablerepo=photon-local --installroot=$TEMP_CHROOT clean all

-

-cp $(pwd)/stage/RPMS/noarch/photon-release*.rpm $TEMP_CHROOT

-cp /etc/resolv.conf $TEMP_CHROOT/etc/

-

-# # reinstalling inside to make sure rpmdb is created for tdnf.

-# # TODO find better solution.

-chroot $TEMP_CHROOT bash -c \

-   "rpm -Uvh --nodeps photon-release*.rpm; \

-    tdnf install -y filesystem; \

-    tdnf install -y glibc ; \

-    tdnf install -y bash ; \

-    tdnf install -y coreutils ; \

-    tdnf install -y util-linux; \

-    tdnf install -y tdnf ; \

-    tdnf install -y findutils ; \

-    tdnf install -y vim ; \

-    tdnf install -y grep ; \

-    tdnf install -y which ;"

+tdnf upgrade -y tdnf 

+tdnf --installroot $TEMP_CHROOT/ install -y bash coreutils filesystem findutils glibc grep photon-release photon-repos tdnf util-linux vim which

+rpm --root $TEMP_CHROOT/ --import $TEMP_CHROOT/etc/pki/rpm-gpg/*

 cd $TEMP_CHROOT

 # cleanup anything not needed inside rootfs

-rm -f photon-release*.rpm

 rm -rf usr/src/

 rm -rf home/*

 # rm -rf var/lib/yum/*

 rm -rf var/log/*

 #find var/cache/tdnf/photon/rpms -type f -name "*.rpm" -exec rm {} \;

-

+tdnf install -y tar

 tar cpjf ../$ROOTFS_TAR_FILENAME .

 mkdir -p $STAGE_DIR

 mv ../$ROOTFS_TAR_FILENAME $STAGE_DIR/

@@ -85,5 +56,4 @@ cd ..

 # cleanup

 rm -rf $TEMP_CHROOT

-rm yum.conf