##// END OF EJS Templates
packaging: move dockerrpm output directory creation to dockerrpm...
Mads Kiilerich -
r43672:433cdcb3 stable
parent child Browse files
Show More
@@ -105,7 +105,6 b' fedora$(1):'
105
105
106 .PHONY: docker-fedora$(1)
106 .PHONY: docker-fedora$(1)
107 docker-fedora$(1):
107 docker-fedora$(1):
108 mkdir -p $$(HGROOT)/packages/fedora$(1)
109 ./dockerrpm fedora$(1)
108 ./dockerrpm fedora$(1)
110
109
111 endef
110 endef
@@ -123,7 +122,6 b' centos$(1):'
123
122
124 .PHONY: docker-centos$(1)
123 .PHONY: docker-centos$(1)
125 docker-centos$(1):
124 docker-centos$(1):
126 mkdir -p $$(HGROOT)/packages/centos$(1)
127 ./dockerrpm centos$(1) $$(if $$(filter $(1),$$(CENTOS_WITH_PYTHON_RELEASES)),--withpython)
125 ./dockerrpm centos$(1) $$(if $$(filter $(1),$$(CENTOS_WITH_PYTHON_RELEASES)),--withpython)
128
126
129 endef
127 endef
@@ -21,6 +21,7 b' fi'
21 $BUILDDIR/hg-docker build --build-arg UID=$DOCKERUID --build-arg GID=$DOCKERGID $BUILDDIR/docker/$PLATFORM $CONTAINER
21 $BUILDDIR/hg-docker build --build-arg UID=$DOCKERUID --build-arg GID=$DOCKERGID $BUILDDIR/docker/$PLATFORM $CONTAINER
22
22
23 RPMBUILDDIR=$ROOTDIR/packages/$PLATFORM
23 RPMBUILDDIR=$ROOTDIR/packages/$PLATFORM
24 mkdir -p $RPMBUILDDIR
24 $ROOTDIR/contrib/packaging/buildrpm --rpmbuilddir $RPMBUILDDIR --prepare $*
25 $ROOTDIR/contrib/packaging/buildrpm --rpmbuilddir $RPMBUILDDIR --prepare $*
25
26
26 DSHARED=/mnt/shared
27 DSHARED=/mnt/shared
General Comments 0
You need to be logged in to leave comments. Login now