diff --git a/.gitattributes b/.gitattributes index b0e33ef16133e3e5e1b9c01666a961f3a7dd7146..271b1bd52a932733ecf5f3c65b80ae0d548e0325 100644 --- a/.gitattributes +++ b/.gitattributes @@ -9,7 +9,9 @@ centos_files/cpp-4.8.5-11.el7.x86_64.rpm -text svneol=unset#application/x-rpm centos_files/cracklib-2.9.0-11.el7.i686.rpm -text centos_files/cups-client-1.6.3-26.el7.x86_64.rpm -text centos_files/ed-1.9-4.el7.x86_64.rpm -text +centos_files/gcc-c++-4.8.5-11.el7.x86_64.rpm -text centos_files/glibc-2.17-157.el7_3.1.i686.rpm -text +centos_files/jq-1.5-1.el7.x86_64.rpm -text centos_files/kernel-headers-3.10.0-514.16.1.el7.x86_64.rpm -text svneol=unset#application/x-rpm centos_files/libcap-ng-0.7.5-4.el7.i686.rpm -text centos_files/libdb-5.3.21-19.el7.i686.rpm -text @@ -36,6 +38,7 @@ centos_files/pam-1.1.8-18.el7.x86_64.rpm -text svneol=unset#application/x-rpm centos_files/patch-2.7.1-8.el7.x86_64.rpm -text svneol=unset#application/x-rpm centos_files/pcre-8.32-15.el7_2.1.i686.rpm -text centos_files/pcre-8.32-15.el7_2.1.x86_64.rpm -text svneol=unset#application/x-rpm +centos_files/perl-JSON-PP-2.27202-2.el7.noarch.rpm -text centos_files/postgresql-9.2.18-1.el7.x86_64.rpm -text svneol=unset#application/x-rpm centos_files/postgresql-contrib-9.2.18-1.el7.x86_64.rpm -text svneol=unset#application/x-rpm centos_files/postgresql-devel-9.2.18-1.el7.x86_64.rpm -text svneol=unset#application/x-rpm @@ -44,7 +47,6 @@ centos_files/postgresql-server-9.2.18-1.el7.x86_64.rpm -text svneol=unset#applic centos_files/readline-6.2-9.el7.i686.rpm -text centos_files/redhat-lsb-core-4.1-27.el7.centos.1.i686.rpm -text centos_files/redhat-lsb-submod-security-4.1-27.el7.centos.1.i686.rpm -text -centos_files/sclo-subversion19-scons-2.3.4-3.el7.noarch.rpm -text svneol=unset#application/x-rpm centos_files/screen-4.1.0-0.23.20120314git3c2946.el7_2.x86_64.rpm -text svneol=unset#application/x-rpm centos_files/spax-1.5.2-13.el7.x86_64.rpm -text svneol=unset#application/x-rpm centos_files/sqlite-3.7.17-8.el7.i686.rpm -text diff --git a/build-all.sh b/build-all.sh index 02b52e90daaac774ffca98a1198ccd65c4cfa1aa..9039e3399980c0cfb9f42c108d5b1f834d40a710 100755 --- a/build-all.sh +++ b/build-all.sh @@ -19,10 +19,8 @@ mkdir -p $ZEST_RUNTIME/lib64 mkdir -p $ZEST_RUNTIME/bin mkdir -p $ZEST_RUNTIME/sbin -if [ ! -f manifest.txt.config ]; then - if [ ! -d "$PS_INSTALL" ]; then - mkdir "$PS_INSTALL" - fi +if [ ! -f manifest.txt.config -o ! -d "$PS_INSTALL" ]; then + mkdir -p "$PS_INSTALL" $PEDI_HOME/pedi --setup -m manifest.txt -l ida -l ida_key -l ps -l zipr -l stratafier -l stars -i $PS_INSTALL fi diff --git a/centos_files/gcc-c++-4.8.5-11.el7.x86_64.rpm.REMOVED.git-id b/centos_files/gcc-c++-4.8.5-11.el7.x86_64.rpm.REMOVED.git-id new file mode 100644 index 0000000000000000000000000000000000000000..7b7590db72d93ec8a0f96bd235d120a47e938d88 --- /dev/null +++ b/centos_files/gcc-c++-4.8.5-11.el7.x86_64.rpm.REMOVED.git-id @@ -0,0 +1 @@ +46d4f45313e33e46cb38900fd5bf56fb6776c854 \ No newline at end of file diff --git a/centos_files/jq-1.5-1.el7.x86_64.rpm b/centos_files/jq-1.5-1.el7.x86_64.rpm new file mode 100644 index 0000000000000000000000000000000000000000..69b2decd67cdb7fec3c2ea91f957317f9c043c49 Binary files /dev/null and b/centos_files/jq-1.5-1.el7.x86_64.rpm differ diff --git a/centos_files/perl-JSON-PP-2.27202-2.el7.noarch.rpm b/centos_files/perl-JSON-PP-2.27202-2.el7.noarch.rpm new file mode 100644 index 0000000000000000000000000000000000000000..05a4ae8f6fb2ee18cf38cb73ca351d97e636c73a Binary files /dev/null and b/centos_files/perl-JSON-PP-2.27202-2.el7.noarch.rpm differ diff --git a/centos_files/sclo-subversion19-scons-2.3.4-3.el7.noarch.rpm b/centos_files/sclo-subversion19-scons-2.3.4-3.el7.noarch.rpm deleted file mode 100644 index a87840e6f4f0f693c4acfa378baa7f0b57b87505..0000000000000000000000000000000000000000 Binary files a/centos_files/sclo-subversion19-scons-2.3.4-3.el7.noarch.rpm and /dev/null differ diff --git a/manifest.txt b/manifest.txt index 0454b13fe28f02e230987e46babeca67bfe06b53..8c1423397286618d7c7842de4f5ed7ae90fd528c 100644 --- a/manifest.txt +++ b/manifest.txt @@ -9,3 +9,5 @@ file set_command_envs ps file set_env_vars ps file set_ida_server ps file irdb_vars ps +file yum_packages.sh centos +directory centos_files centos diff --git a/set_env_vars b/set_env_vars index bcca12ff0c84500144fb4faa2361bf5701f4375a..ff1dbc12bb95051f775c6128f49d0e2b7bbcaf10 100644 --- a/set_env_vars +++ b/set_env_vars @@ -23,11 +23,16 @@ export IRDB_TRANSFORMS=$PEASOUP_UMBRELLA_DIR/irdb_transforms export ZEST_RUNTIME=$PEASOUP_UMBRELLA_DIR/zest_runtime export DAFFY_HOME=$PEASOUP_UMBRELLA_DIR/daffy -if [ -z $PS_INSTALL ]; then - export PS_INSTALL=$PEASOUP_UMBRELLA_DIR/installed +if [ -z "$PS_INSTALL" -o -f manifest.txt ]; then + if [ -z $PS_INSTALL ]; then + export PS_INSTALL=$PEASOUP_UMBRELLA_DIR/installed + fi + export PS=$PS_INSTALL/peasoup_examples/tools/ps_analyze.sh + export PSZ=$PS_INSTALL/peasoup_examples/tools/ps_zipr.sh +else + export PS=$PEASOUP_UMBRELLA_DIR/peasoup_examples/tools/ps_analyze.sh + export PSZ=$PEASOUP_UMBRELLA_DIR/peasoup_examples/tools/ps_zipr.sh fi -export PS=$PS_INSTALL/peasoup_examples/tools/ps_analyze.sh -export PSZ=$PS_INSTALL/peasoup_examples/tools/ps_zipr.sh source ./irdb_vars source $PEASOUP_UMBRELLA_DIR/set_command_envs