Merge pull request #8 from aws/fixBuild386

change rpm build scripts and amazon-ssm-agent spec file for generatin…

Author: shihuazhang

Tools/src/create_rpm.sh

@@ -30,10 +30,10 @@ cd ${BGO_SPACE}/bin/linux_amd64/linux/usr/bin/; strip --strip-unneeded amazon-ss
 
 echo "Creating the rpm package"
 
-BUILD_ROOT="--buildroot ${BGO_SPACE}/bin/linux_amd64/linux"
 SPEC_FILE="${BGO_SPACE}/packaging/linux/amazon-ssm-agent.spec"
+BUILD_ROOT="${BGO_SPACE}/bin/linux_amd64/linux"
 
-rpmbuild -bb --define "rpmversion `cat ${BGO_SPACE}/VERSION`" --define "buildarch 'x86_64'" --define "_topdir bin/linux_amd64/linux/rpmbuild" ${BUILD_ROOT} ${SPEC_FILE}
+setarch x86_64 rpmbuild -bb --define "rpmversion `cat ${BGO_SPACE}/VERSION`" --define "_topdir bin/linux_amd64/linux/rpmbuild" --buildroot ${BUILD_ROOT} ${SPEC_FILE}
 
 echo "Copying rpm files to bin"
 

Tools/src/create_rpm_386.sh

@@ -30,11 +30,12 @@ cd ${BGO_SPACE}/bin/linux_386/linux/usr/bin/; strip --strip-unneeded amazon-ssm-
 
 echo "Creating the rpm package"
 
-BUILD_ROOT="--buildroot ${BGO_SPACE}/bin/linux_386/linux"
 SPEC_FILE="${BGO_SPACE}/packaging/linux/amazon-ssm-agent.spec"
+BUILD_ROOT="${BGO_SPACE}/bin/linux_386/linux"
+
+setarch i386 rpmbuild --target i386 -bb --define "rpmversion `cat ${BGO_SPACE}/VERSION`" --define "_topdir bin/linux_386/linux/rpmbuild" --buildroot ${BUILD_ROOT} ${SPEC_FILE}
 
-setarch i686 rpmbuild --target i686 -bb --define "rpmversion `cat ${BGO_SPACE}/VERSION`" --define "buildarch 'noarch'" --define "_topdir bin/linux_386/linux/rpmbuild" ${BUILD_ROOT} ${SPEC_FILE}
 echo "Copying rpm files to bin"
 
-cp ${BGO_SPACE}/bin/linux_386/linux/rpmbuild/RPMS/noarch/*.rpm ${BGO_SPACE}/bin/
-cp ${BGO_SPACE}/bin/linux_386/linux/rpmbuild/RPMS/noarch/*.rpm ${BGO_SPACE}/bin/linux_386/amazon-ssm-agent.rpm
+cp ${BGO_SPACE}/bin/linux_386/linux/rpmbuild/RPMS/i386/*.rpm ${BGO_SPACE}/bin/
+cp ${BGO_SPACE}/bin/linux_386/linux/rpmbuild/RPMS/i386/*.rpm ${BGO_SPACE}/bin/linux_386/amazon-ssm-agent.rpm

packaging/linux/amazon-ssm-agent.spec

@@ -1,12 +1,9 @@
-%define _binaries_in_noarch_packages_terminate_build   0
-
 Name         : amazon-ssm-agent
 Version      : %rpmversion
 Release      : 1
 Summary      : Manage EC2 Instances using SSM APIs
 
 Group        : Amazon/Tools
-BuildArch    : %buildarch
 License      : Amazon Software License
 URL          : http://docs.aws.amazon.com/ssm/latest/APIReference/Welcome.html