diff --git a/concourse/scripts/compile_gpdb.bash b/concourse/scripts/compile_gpdb.bash index 6785724765fece768b05c7a2d6ef301890eaf680..a6a73b4661ed2cdc4383d21f9835f21f2ce45e39 100755 --- a/concourse/scripts/compile_gpdb.bash +++ b/concourse/scripts/compile_gpdb.bash @@ -110,7 +110,9 @@ function export_gpdb_extensions() { chmod 755 greenplum-*zip* cp greenplum-*zip* "$GPDB_ARTIFACTS_DIR"/ fi - chmod 755 "$GPDB_ARTIFACTS_DIR"/*.gppkg + if ls "$GPDB_ARTIFACTS_DIR"/*.gppkg 1>/dev/null 2>&1; then + chmod 755 "$GPDB_ARTIFACTS_DIR"/*.gppkg + fi popd } diff --git a/gpAux/Makefile b/gpAux/Makefile index 1336eddf535f3b6b976e7b60a8da8352408dd504..2e95e34b9078a608a70aede2334c5d586fac7c19 100644 --- a/gpAux/Makefile +++ b/gpAux/Makefile @@ -1240,7 +1240,6 @@ gccVersionCheck : ifeq ($(BLD_ARCH),$(filter $(BLD_ARCH),rhel7_x86_64 rhel6_x86_64)) GPPKG_SOURCES = \ - ../src/pl/plperl \ $(NULL) else # Removed filtering logic for building gppkg as on suse11. It was only building @@ -1250,7 +1249,6 @@ else # TODO: As we build for centos6 we can add filtering logic if necessary GPPKG_SOURCES = \ ../contrib/pgcrypto \ - ../src/pl/plperl \ ../src/bin/pg_dump/cdb/ddboost \ extensions/postgis-2.0.3 \ extensions/plr \ @@ -1304,12 +1302,10 @@ endif ifeq ($(BLD_ARCH),$(filter $(BLD_ARCH),rhel7_x86_64 rhel6_x86_64 suse11_x86_64)) GPPKG_ROOT_DIR = \ - ../src/pl/plperl \ $(NULL) else GPPKG_ROOT_DIR = \ ../contrib/pgcrypto \ - ../src/pl/plperl \ $(NULL) endif diff --git a/src/pl/plperl/package/Makefile b/src/pl/plperl/package/Makefile deleted file mode 100644 index c63bc3770d0f4b88aa2f8ca3e54f03f15eb4c036..0000000000000000000000000000000000000000 --- a/src/pl/plperl/package/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -all: gppkg - -BLD_TOP=../../../../gpAux -GPMGMT=$(BLD_TOP)/gpMgmt -include $(BLD_TOP)/releng/tools.mk -include $(BLD_TOP)/releng/releng.mk -include $(BLD_TOP)/Makefile.global - -OS=$(word 1,$(subst _, ,$(BLD_ARCH))) -ARCH=$(shell uname -p) - -# NOTE: PERL_DIR is dfined in $(BLD_TOP)/releng/releng.mk - -PLPERL_GPPKG_VER=ossv5.12.4_pv1.3_gpdb4.3orca -PLPERL_VER=1.3 -PLPERL_REL=4 -PLPERL_DIR=`cd .. && pwd` -PLPERL_RPM_FLAGS="--define 'plperl_dir $(PLPERL_DIR)' --define 'plperl_ver $(PLPERL_VER)' --define 'plperl_rel $(PLPERL_REL)' " -PLPERL_RPM=plperl-$(PLPERL_VER)-$(PLPERL_REL).$(ARCH).rpm -PLPERL_GPPKG=plperl-$(PLPERL_GPPKG_VER)-$(OS)-$(ARCH).gppkg - -TARGET_GPPKG=$(PLPERL_GPPKG) -EXTRA_CLEAN+=$(PLPERL_RPM) $(PLPERL_GPPKG) - -# -# Generic rules to build gppkgs included here -# -include $(BLD_TOP)/releng/gppkg.mk - -gppkg: - $(MAKE) $(PLPERL_RPM) RPM_FLAGS=$(PLPERL_RPM_FLAGS) - $(MAKE) $(PLPERL_GPPKG) MAIN_RPM=$(PLPERL_RPM) - -.PHONY: gppkg diff --git a/src/pl/plperl/package/gppkg_spec.yml.in b/src/pl/plperl/package/gppkg_spec.yml.in deleted file mode 100644 index f241ac72f247b7a81bb2afbedce10051112a5657..0000000000000000000000000000000000000000 --- a/src/pl/plperl/package/gppkg_spec.yml.in +++ /dev/null @@ -1,9 +0,0 @@ -Pkgname: plperl -Architecture: #arch -OS: #os -Version: ossv5.12.4_pv1.3_gpdb4.3orca -GPDBVersion: 4.3 -Description: Provides a procedural langauge implementation of Perl for the Greenplum Database. -PostInstall: -- Master: "echo 'Please source your $GPHOME/greenplum_path.sh and restart the database.'; - echo 'You can enable plperl by running createlang plperl -d mydatabase.' ;" diff --git a/src/pl/plperl/package/perl.spec b/src/pl/plperl/package/perl.spec deleted file mode 100644 index b7b18f639b7acb4c97241e3a80a01d4d13479113..0000000000000000000000000000000000000000 --- a/src/pl/plperl/package/perl.spec +++ /dev/null @@ -1,30 +0,0 @@ -Summary: Perl -License: Artistic License -Name: perl -Version: %{perl_ver} -Release: %{perl_rel} -Group: Development/Tools -Prefix: /temp -AutoReq: no -AutoProv: no -Provides: perl = %{perl_ver}, /bin/sh - -%description -The Perl package provides Perl for PL/Perl. - -%install -mkdir -p %{buildroot}/temp/ext/perl-%{perl_ver} -cp -r %{perl_dir}/* %{buildroot}/temp/ext/perl-%{perl_ver} - -%post -echo "PERL5HOME=\$GPHOME/ext/perl-%{perl_ver}" >> $GPHOME/greenplum_path.sh -echo "export PATH=\$PERL5HOME/bin:\$PATH" >> $GPHOME/greenplum_path.sh -echo "export LD_LIBRARY_PATH=\$PERL5HOME/lib/%{perl_ver}/x86_64-linux/CORE:\$LD_LIBRARY_PATH" >> $GPHOME/greenplum_path.sh -echo "export PERL5LIB=\$PERL5HOME/lib/site_perl/%{perl_ver}/x86_64-linux:\$PERL5HOME/lib/site_perl/%{perl_ver}:\$PERL5HOME/lib/%{perl_ver}/x86_64-linux:\$PERL5HOME/lib/%{perl_ver}" >> $GPHOME/greenplum_path.sh - -%postun -sed -i".bk" "/PERL5HOME/d" $GPHOME/greenplum_path.sh -rm -rf $GPHOME/greenplum_path.sh.bk - -%files -/temp diff --git a/src/pl/plperl/package/plperl.spec b/src/pl/plperl/package/plperl.spec deleted file mode 100644 index 165ccb5a92e6141aa2d4cf117f84dabb5da717e6..0000000000000000000000000000000000000000 --- a/src/pl/plperl/package/plperl.spec +++ /dev/null @@ -1,20 +0,0 @@ -Summary: PL/Perl for Greenplum Database -License: Artistic License -Name: plperl -Version: %{plperl_ver} -Release: %{plperl_rel} -Group: Development/Tools -Prefix: /temp -AutoReq: no -AutoProv: no -Provides: plperl = %{plperl_ver} - -%description -The PL/Perl package provides Procedural language implementation of Perl for Greenplum Database. - -%install -mkdir -p %{buildroot}/temp -make -C %{plperl_dir} install prefix=%{buildroot}/temp - -%files -/temp