From cbeb079a36c1a24678dcf711b706017834b483e6 Mon Sep 17 00:00:00 2001 From: Ben Shum Date: Wed, 20 Sep 2017 15:49:37 -0400 Subject: [PATCH] LP#1718549: Use Nodejs source install for all distributions Due to dependency issues and the need for newer NodeJS version, install from source for all distributions, not just the ones without pre-packaged apt sources. Signed-off-by: Ben Shum Signed-off-by: Galen Charlton --- Open-ILS/src/extras/install/Makefile.debian-jessie | 9 ++------- Open-ILS/src/extras/install/Makefile.debian-stretch | 2 -- Open-ILS/src/extras/install/Makefile.ubuntu-trusty | 2 -- Open-ILS/src/extras/install/Makefile.ubuntu-xenial | 9 ++------- 4 files changed, 4 insertions(+), 18 deletions(-) diff --git a/Open-ILS/src/extras/install/Makefile.debian-jessie b/Open-ILS/src/extras/install/Makefile.debian-jessie index 53039fbbf8..c72c9a826f 100644 --- a/Open-ILS/src/extras/install/Makefile.debian-jessie +++ b/Open-ILS/src/extras/install/Makefile.debian-jessie @@ -109,14 +109,10 @@ PGSQL_SERVER_DEBS_94 = \ # sections to support building Evergreen packages on servers # where Evergreen and its prereqs are not installed. -# nodejs-legacy creates a symlink for /usr/bin/node -> /usr/bin/nodejs -# which is needed by our npm-installed packages DEVELOPER_DEBS = \ automake \ autoconf \ - libtool \ - nodejs-legacy \ - npm + libtool PACKAGER_DEBS = \ asciidoc \ @@ -150,8 +146,7 @@ install_postgres_server: # package, use the packaged version instead. install_developer: make -f $(DIR)/Makefile.debian DEBS="$(DEVELOPER_DEBS)" - npm update - npm install -g grunt-cli + make -f $(DIR)/Makefile.common install_nodejs_from_source install_translator: install_developer make -f $(DIR)/Makefile.debian DEBS="$(TRANSLATOR_DEBS)" diff --git a/Open-ILS/src/extras/install/Makefile.debian-stretch b/Open-ILS/src/extras/install/Makefile.debian-stretch index bd15ce5b53..0918ef8802 100644 --- a/Open-ILS/src/extras/install/Makefile.debian-stretch +++ b/Open-ILS/src/extras/install/Makefile.debian-stretch @@ -108,8 +108,6 @@ PGSQL_SERVER_DEBS_96 = \ # sections to support building Evergreen packages on servers # where Evergreen and its prereqs are not installed. -# nodejs-legacy creates a symlink for /usr/bin/node -> /usr/bin/nodejs -# which is needed by our npm-installed packages DEVELOPER_DEBS = \ automake \ autoconf \ diff --git a/Open-ILS/src/extras/install/Makefile.ubuntu-trusty b/Open-ILS/src/extras/install/Makefile.ubuntu-trusty index def3fb620c..2f051a6525 100644 --- a/Open-ILS/src/extras/install/Makefile.ubuntu-trusty +++ b/Open-ILS/src/extras/install/Makefile.ubuntu-trusty @@ -112,8 +112,6 @@ PGSQL_SERVER_DEBS_94 = \ # sections to support building Evergreen packages on servers # where Evergreen and its prereqs are not installed. -# nodejs-legacy creates a symlink for /usr/bin/node -> /usr/bin/nodejs -# which is needed by our npm-installed packages DEVELOPER_DEBS = \ automake \ autoconf \ diff --git a/Open-ILS/src/extras/install/Makefile.ubuntu-xenial b/Open-ILS/src/extras/install/Makefile.ubuntu-xenial index ca0cdf3f39..a0a9e8658f 100644 --- a/Open-ILS/src/extras/install/Makefile.ubuntu-xenial +++ b/Open-ILS/src/extras/install/Makefile.ubuntu-xenial @@ -108,14 +108,10 @@ PGSQL_SERVER_DEBS_95 = \ # sections to support building Evergreen packages on servers # where Evergreen and its prereqs are not installed. -# nodejs-legacy creates a symlink for /usr/bin/node -> /usr/bin/nodejs -# which is needed by our npm-installed packages DEVELOPER_DEBS = \ automake \ autoconf \ - libtool \ - nodejs-legacy \ - npm + libtool PACKAGER_DEBS = \ asciidoc \ @@ -149,8 +145,7 @@ install_postgres_server: # package, use the packaged version instead. install_developer: make -f $(DIR)/Makefile.debian DEBS="$(DEVELOPER_DEBS)" - npm update - npm install -g grunt-cli + make -f $(DIR)/Makefile.common install_nodejs_from_source install_translator: install_developer make -f $(DIR)/Makefile.debian DEBS="$(TRANSLATOR_DEBS)" -- 2.43.2