25877098 'gmake prep' fails for several components
authorJohn Beck <John.Beck@Oracle.COM>
Wed, 12 Apr 2017 14:48:14 -0700
changeset 7860 8991c11f87b1
parent 7859 d828b72ad743
child 7861 8b7335f2b6cf
25877098 'gmake prep' fails for several components
components/apache2-modules/mod_dtrace/Makefile
components/common/Makefile
components/desktop/desktop-cache/Makefile
components/docbook/dtds/Makefile
components/hwdata/Makefile
components/libusb/ugen/Makefile
components/libusb/wrapper/Makefile
components/meta-packages/developer-opensolaris-userland/Makefile
components/meta-packages/evaluation/Makefile
components/meta-packages/group-feature/Makefile
components/meta-packages/history/Makefile
components/mysql-common/Makefile
components/openstack/common/Makefile
components/perl/perl-common/Makefile
components/php-common/Makefile
components/rpm2cpio/Makefile
components/ruby/ruby-common/Makefile
components/timezone/Makefile
make-rules/prep-unpack.mk
--- a/components/apache2-modules/mod_dtrace/Makefile	Tue Apr 11 20:19:32 2017 -0700
+++ b/components/apache2-modules/mod_dtrace/Makefile	Wed Apr 12 14:48:14 2017 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 BUILD_BITS= 64
 include ../../../make-rules/shared-macros.mk
@@ -41,5 +41,3 @@
 COMPONENT_BUILD_ARGS +=	APXS=$(APXS)
 COMPONENT_BUILD_ARGS +=	DTRACE="$(USRSBINDIR)/dtrace -$(BITS)"
 COMPONENT_BUILD_ARGS +=	PATH="$(PATH)"
-
-CLEAN_PATHS += $(SOURCE_DIR)/.prep
--- a/components/common/Makefile	Tue Apr 11 20:19:32 2017 -0700
+++ b/components/common/Makefile	Wed Apr 12 14:48:14 2017 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -31,17 +31,12 @@
 COMPONENT_BUGDB=	gate-stuff/userland
 COMPONENT_SRC=
 COMPONENT_ARCHIVE=
+COMPONENT_ARCHIVE_SRC=	none
 
 include $(WS_MAKE_RULES)/prep.mk
 
-# Do not clean the sources (set in prep.mk)
-#
-CLEAN_PATHS=
-
 include $(WS_MAKE_RULES)/ips.mk
 
-CLEAN_PATHS+= $(BUILD_DIR)
-
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
 # common targets
--- a/components/desktop/desktop-cache/Makefile	Tue Apr 11 20:19:32 2017 -0700
+++ b/components/desktop/desktop-cache/Makefile	Wed Apr 12 14:48:14 2017 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 BUILD_BITS= NO_ARCH
@@ -30,6 +30,7 @@
 COMPONENT_VERSION=      0.2.9
 COMPONENT_SRC=          # all files under files/
 COMPONENT_BUGDB=	gnome/install
+COMPONENT_ARCHIVE_SRC=	none
 
 # nothing to download or build; just package
 BUILD_STYLE= pkg
--- a/components/docbook/dtds/Makefile	Tue Apr 11 20:19:32 2017 -0700
+++ b/components/docbook/dtds/Makefile	Wed Apr 12 14:48:14 2017 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 BUILD_BITS=		NO_ARCH
@@ -38,7 +38,7 @@
 COMPONENT_ARCHIVE_SRC=	none
 COMPONENT_SRC=		
 SOURCE_DIR=		$(COMPONENT_DIR)
-CLEAN_PATHS +=		$(COMPONENT_DIR)/.prep $(COMPONENT_DIR)/.patched*
+CLEAN_PATHS +=		$(COMPONENT_DIR)/.patched*
 
 BUILD_STYLE=		archive
 BUILD_TARGET +=		prep
--- a/components/hwdata/Makefile	Tue Apr 11 20:19:32 2017 -0700
+++ b/components/hwdata/Makefile	Wed Apr 12 14:48:14 2017 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 BUILD_BITS= NO_ARCH
 include ../../make-rules/shared-macros.mk
@@ -28,6 +28,7 @@
 COMPONENT_NAME=         hwdata
 COMPONENT_VERSION=      0.5.11
 COMPONENT_SRC=
+COMPONENT_ARCHIVE_SRC=	none
 
 TPNO_PCI=	21782
 TPNO_USB=	21783
--- a/components/libusb/ugen/Makefile	Tue Apr 11 20:19:32 2017 -0700
+++ b/components/libusb/ugen/Makefile	Wed Apr 12 14:48:14 2017 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 BUILD_BITS= 64_and_32
 include ../../../make-rules/shared-macros.mk
@@ -49,8 +49,6 @@
 
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
-CLEAN_PATHS +=	$(SOURCE_DIR)/.prep
-
 # test enumerates USB devices plugged into your system
 
 REQUIRED_PACKAGES += system/io/usb
--- a/components/libusb/wrapper/Makefile	Tue Apr 11 20:19:32 2017 -0700
+++ b/components/libusb/wrapper/Makefile	Wed Apr 12 14:48:14 2017 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../../make-rules/shared-macros.mk
 
@@ -49,8 +49,6 @@
 
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
-CLEAN_PATHS +=	$(SOURCE_DIR)/.prep
-
 $(BUILD_DIR)/libusb-64.pc:	src/libusb-64.pc
 	/bin/sed -e "s#MACH64#$(MACH64)#g" <$< >[email protected]
 
--- a/components/meta-packages/developer-opensolaris-userland/Makefile	Tue Apr 11 20:19:32 2017 -0700
+++ b/components/meta-packages/developer-opensolaris-userland/Makefile	Wed Apr 12 14:48:14 2017 -0700
@@ -29,6 +29,7 @@
 COMPONENT_VERSION=
 COMPONENT_SRC=
 COMPONENT_ARCHIVE=
+COMPONENT_ARCHIVE_SRC=	none
 COMPONENT_PROJECT_URL=	https://github.com/oracle/solaris-userland
 COMPONENT_ARCHIVE_URL=	https://github.com/oracle/solaris-userland.git
 COMPONENT_BUGDB=	gate-stuff/userland
--- a/components/meta-packages/evaluation/Makefile	Tue Apr 11 20:19:32 2017 -0700
+++ b/components/meta-packages/evaluation/Makefile	Wed Apr 12 14:48:14 2017 -0700
@@ -20,22 +20,19 @@
 #
 
 #
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		evaluation
 COMPONENT_VERSION=	1.0
 COMPONENT_SRC=
+COMPONENT_ARCHIVE_SRC=	none
 COMPONENT_BUGDB=	gate-stuff/userland
 
 ifneq ($(BUILD_TYPE), evaluation)
 PUBLISH_STAMP=
 endif
 
-# Override default settings in prep.mk so we don't delete the entire directory.
-CLEAN_PATHS=	$(BUILD_DIR)
-CLOBBER_PATHS=	$(BUILD_DIR)
-
 BUILD_STYLE= pkg
 include $(WS_MAKE_RULES)/common.mk
--- a/components/meta-packages/group-feature/Makefile	Tue Apr 11 20:19:32 2017 -0700
+++ b/components/meta-packages/group-feature/Makefile	Wed Apr 12 14:48:14 2017 -0700
@@ -29,6 +29,7 @@
 COMPONENT_VERSION=	$(PKG_SOLARIS_VERSION)
 COMPONENT_SRC=
 COMPONENT_ARCHIVE=
+COMPONENT_ARCHIVE_SRC=	none
 COMPONENT_PROJECT_URL=	https://github.com/oracle/solaris-userland
 COMPONENT_ARCHIVE_URL=	https://github.com/oracle/solaris-userland.git
 COMPONENT_BUGDB=	gate-stuff/userland
--- a/components/meta-packages/history/Makefile	Tue Apr 11 20:19:32 2017 -0700
+++ b/components/meta-packages/history/Makefile	Wed Apr 12 14:48:14 2017 -0700
@@ -30,6 +30,7 @@
 # really don't need to do for these static, uninteresting packages.  So we just
 # write a simple set of publication rules to get the packages into the repo.
 COMPONENT_SRC=
+COMPONENT_ARCHIVE_SRC=	none
 include $(WS_MAKE_RULES)/prep.mk
 
 COMPONENT_NAME=		"Package History"
--- a/components/mysql-common/Makefile	Tue Apr 11 20:19:32 2017 -0700
+++ b/components/mysql-common/Makefile	Wed Apr 12 14:48:14 2017 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 BUILD_BITS= NO_ARCH
 include ../../make-rules/shared-macros.mk
@@ -28,6 +28,7 @@
 COMPONENT_NAME=		mysql-common
 COMPONENT_VERSION=	5.11
 COMPONENT_SRC=
+COMPONENT_ARCHIVE_SRC=	none
 COMPONENT_PROJECT_URL=	http://dev.mysql.com/
 COMPONENT_BUGDB=	database/mysql
 
--- a/components/openstack/common/Makefile	Tue Apr 11 20:19:32 2017 -0700
+++ b/components/openstack/common/Makefile	Wed Apr 12 14:48:14 2017 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../../make-rules/shared-macros.mk
@@ -28,6 +28,7 @@
 COMPONENT_NAME=		openstack
 COMPONENT_VERSION=	2016.1.1
 COMPONENT_SRC=
+COMPONENT_ARCHIVE_SRC=	none
 COMPONENT_PROJECT_URL=	http://www.openstack.org/
 COMPONENT_BUGDB=	service/nova
 IPS_COMPONENT_VERSION=	0.2016.1
--- a/components/perl/perl-common/Makefile	Tue Apr 11 20:19:32 2017 -0700
+++ b/components/perl/perl-common/Makefile	Wed Apr 12 14:48:14 2017 -0700
@@ -36,6 +36,7 @@
 COMPONENT_NAME=		perl-common
 COMPONENT_VERSION=	1
 COMPONENT_SRC=
+COMPONENT_ARCHIVE_SRC=	none
 COMPONENT_PROJECT_URL=	http://www.perl.org/
 COMPONENT_BUGDB=	utility/perl
 
--- a/components/php-common/Makefile	Tue Apr 11 20:19:32 2017 -0700
+++ b/components/php-common/Makefile	Wed Apr 12 14:48:14 2017 -0700
@@ -20,12 +20,13 @@
 #
 
 #
-# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		php-common
 COMPONENT_SRC=
+COMPONENT_ARCHIVE_SRC=	none
 # This version # based on the version # of Solaris
 COMPONENT_VERSION=	11.1
 COMPONENT_PROJECT_URL=	http://www.php.net/
--- a/components/rpm2cpio/Makefile	Tue Apr 11 20:19:32 2017 -0700
+++ b/components/rpm2cpio/Makefile	Wed Apr 12 14:48:14 2017 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 BUILD_BITS= NO_ARCH
 include ../../make-rules/shared-macros.mk
@@ -44,12 +44,6 @@
 COMMON_TARGETS= no
 include $(WS_MAKE_RULES)/common.mk
 
-# Do not clean the sources (set in prep.mk)
-#
-CLEAN_PATHS=
-
-CLEAN_PATHS += $(BUILD_DIR)
-
 # Common targets
 #
 build:
--- a/components/ruby/ruby-common/Makefile	Tue Apr 11 20:19:32 2017 -0700
+++ b/components/ruby/ruby-common/Makefile	Wed Apr 12 14:48:14 2017 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../../make-rules/shared-macros.mk
 
@@ -28,6 +28,7 @@
 # the latest version of Ruby
 COMPONENT_VERSION=	2.1
 COMPONENT_SRC=
+COMPONENT_ARCHIVE_SRC=	none
 COMPONENT_PROJECT_URL=	http://www.ruby-lang.org/
 COMPONENT_BUGDB=	utility/ruby
 
--- a/components/timezone/Makefile	Tue Apr 11 20:19:32 2017 -0700
+++ b/components/timezone/Makefile	Wed Apr 12 14:48:14 2017 -0700
@@ -29,6 +29,7 @@
 COMPONENT_NAME= 	timezone
 COMPONENT_VERSION=    	2017.1
 COMPONENT_SRC=
+COMPONENT_ARCHIVE_SRC=	none
 HUMAN_VERSION=		2017a
 TPNO=			24870
 COMPONENT_ANITYA_ID=	5021
--- a/make-rules/prep-unpack.mk	Tue Apr 11 20:19:32 2017 -0700
+++ b/make-rules/prep-unpack.mk	Wed Apr 12 14:48:14 2017 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 UNPACK =		$(WS_TOOLS)/userland-unpack
@@ -54,6 +54,8 @@
 SOURCE_DIR$(1) = $$(COMPONENT_SRC$(1):%=$$(COMPONENT_DIR)/%)
 
 UNPACK_STAMP$(1) =	$$(SOURCE_DIR$(1):%=%/.unpacked)
+else
+CLEAN_PATHS += $$(SOURCE_DIR$(1))/.prep
 endif
 endef