Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'master' into 'master'
Fix python bytecompile failure
  • Loading branch information
stskeeps committed Jun 13, 2014
2 parents bb627cb + b9895bd commit b823c3b
Show file tree
Hide file tree
Showing 10 changed files with 12 additions and 0 deletions.
1 change: 1 addition & 0 deletions sb2-tools-aarch64.spec
Expand Up @@ -3,6 +3,7 @@
%define _build_name_fmt %%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.dontuse.rpm
%define packages_in_tools fakeroot bash bzip2 bzip2-libs coreutils db4 diffutils elfutils elfutils-libs elfutils-libelf fdupes file-libs filesystem glibc glibc-common groff libacl libattr libcap libgcc liblua libstdc++ ncurses-libs nspr nss nss-softokn-freebl pam popt readline rpm rpm rpm-build rpm-build rpm-devel rpm-libs rpm-libs sed setup sqlite tar xz-libs zlib perl perl-threads perl-threads-shared perl-Scalar-List-Utils perl-libs util-linux libblkid libuuid grep pcre scratchbox2 libsb2 gawk glib2 file net-tools glibc-devel gcc libgomp glibc-headers kernel-headers binutils cpp mpc mpfr gmp findutils cpio rpmlint-mini make m4 gzip libcap openssl-libs qemu-usermode autoconf automake ccache qtchooser qt-qmake qt5-qmake python python-libs zip xz doxygen qt-tools qt5-tools fontconfig freetype expat cmake libarchive libcurl libxml2 libidn
%define cross_compilers cross-aarch64-gcc cross-aarch64-binutils
%global _python_bytecompile_errors_terminate_build 0

Name: sb2-tools-aarch64
Version: 1.0
Expand Down
1 change: 1 addition & 0 deletions sb2-tools-armv6l.spec
Expand Up @@ -3,6 +3,7 @@
%define _build_name_fmt %%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.dontuse.rpm
%define packages_in_tools fakeroot bash bzip2 bzip2-libs coreutils db4 diffutils elfutils elfutils-libs elfutils-libelf fdupes file-libs filesystem glibc glibc-common groff libacl libattr libcap libgcc liblua libstdc++ ncurses-libs nspr nss nss-softokn-freebl pam popt readline rpm rpm rpm-build rpm-build rpm-devel rpm-libs rpm-libs sed setup sqlite tar xz-libs zlib perl perl-threads perl-threads-shared perl-Scalar-List-Utils perl-libs util-linux libblkid libuuid grep pcre scratchbox2 libsb2 gawk glib2 file net-tools glibc-devel gcc libgomp glibc-headers kernel-headers binutils cpp mpc mpfr gmp findutils cpio rpmlint-mini make m4 gzip libcap openssl-libs qemu-usermode autoconf automake ccache qtchooser qt-qmake qt5-qmake python python-libs zip xz doxygen qt-tools qt5-tools fontconfig freetype expat cmake libarchive libcurl libxml2 libidn
%define cross_compilers cross-armv6l-gcc cross-armv6l-binutils
%global _python_bytecompile_errors_terminate_build 0

Name: sb2-tools-armv6l
Version: 1.0
Expand Down
1 change: 1 addition & 0 deletions sb2-tools-armv7hl.spec
Expand Up @@ -3,6 +3,7 @@
%define _build_name_fmt %%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.dontuse.rpm
%define packages_in_tools fakeroot bash bzip2 bzip2-libs coreutils db4 diffutils elfutils elfutils-libs elfutils-libelf fdupes file-libs filesystem glibc glibc-common groff libacl libattr libcap libgcc liblua libstdc++ ncurses-libs nspr nss nss-softokn-freebl pam popt readline rpm rpm rpm-build rpm-build rpm-devel rpm-libs rpm-libs sed setup sqlite tar xz-libs zlib perl perl-threads perl-threads-shared perl-Scalar-List-Utils perl-libs util-linux libblkid libuuid grep pcre scratchbox2 libsb2 gawk glib2 file net-tools glibc-devel gcc libgomp glibc-headers kernel-headers binutils cpp mpc mpfr gmp findutils cpio rpmlint-mini make m4 gzip libcap openssl-libs qemu-usermode autoconf automake ccache qtchooser qt-qmake qt5-qmake python python-libs zip xz doxygen qt-tools qt5-tools fontconfig freetype expat cmake libarchive libcurl libxml2 libidn
%define cross_compilers cross-armv7hl-gcc cross-armv7hl-binutils
%global _python_bytecompile_errors_terminate_build 0

Name: sb2-tools-armv7hl
Version: 1.0
Expand Down
1 change: 1 addition & 0 deletions sb2-tools-armv7l.spec
Expand Up @@ -3,6 +3,7 @@
%define _build_name_fmt %%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.dontuse.rpm
%define packages_in_tools fakeroot bash bzip2 bzip2-libs coreutils db4 diffutils elfutils elfutils-libs elfutils-libelf fdupes file-libs filesystem glibc glibc-common groff libacl libattr libcap libgcc liblua libstdc++ ncurses-libs nspr nss nss-softokn-freebl pam popt readline rpm rpm rpm-build rpm-build rpm-devel rpm-libs rpm-libs sed setup sqlite tar xz-libs zlib perl perl-threads perl-threads-shared perl-Scalar-List-Utils perl-libs util-linux libblkid libuuid grep pcre scratchbox2 libsb2 gawk glib2 file net-tools glibc-devel gcc libgomp glibc-headers kernel-headers binutils cpp mpc mpfr gmp findutils cpio rpmlint-mini make m4 gzip libcap openssl-libs qemu-usermode autoconf automake ccache qtchooser qt-qmake qt5-qmake python python-libs zip xz doxygen qt-tools qt5-tools fontconfig freetype expat cmake libarchive libcurl libxml2 libidn
%define cross_compilers cross-armv7l-gcc cross-armv7l-binutils
%global _python_bytecompile_errors_terminate_build 0

Name: sb2-tools-armv7l
Version: 1.0
Expand Down
1 change: 1 addition & 0 deletions sb2-tools-armv7thl.spec
Expand Up @@ -3,6 +3,7 @@
%define _build_name_fmt %%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.dontuse.rpm
%define packages_in_tools fakeroot bash bzip2 bzip2-libs coreutils db4 diffutils elfutils elfutils-libs elfutils-libelf fdupes file-libs filesystem glibc glibc-common groff libacl libattr libcap libgcc liblua libstdc++ ncurses-libs nspr nss nss-softokn-freebl pam popt readline rpm rpm rpm-build rpm-build rpm-devel rpm-libs rpm-libs sed setup sqlite tar xz-libs zlib perl perl-threads perl-threads-shared perl-Scalar-List-Utils perl-libs util-linux libblkid libuuid grep pcre scratchbox2 libsb2 gawk glib2 file net-tools glibc-devel gcc libgomp glibc-headers kernel-headers binutils cpp mpc mpfr gmp findutils cpio rpmlint-mini make m4 gzip libcap openssl-libs qemu-usermode autoconf automake ccache qtchooser qt-qmake qt5-qmake python python-libs zip xz doxygen qt-tools qt5-tools fontconfig freetype expat cmake libarchive libcurl libxml2 libidn
%define cross_compilers cross-armv7thl-gcc cross-armv7thl-binutils
%global _python_bytecompile_errors_terminate_build 0

Name: sb2-tools-armv7thl
Version: 1.0
Expand Down
1 change: 1 addition & 0 deletions sb2-tools-armv7tnhl.spec
Expand Up @@ -3,6 +3,7 @@
%define _build_name_fmt %%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.dontuse.rpm
%define packages_in_tools fakeroot bash bzip2 bzip2-libs coreutils db4 diffutils elfutils elfutils-libs elfutils-libelf fdupes file-libs filesystem glibc glibc-common groff libacl libattr libcap libgcc liblua libstdc++ ncurses-libs nspr nss nss-softokn-freebl pam popt readline rpm rpm rpm-build rpm-build rpm-devel rpm-libs rpm-libs sed setup sqlite tar xz-libs zlib perl perl-threads perl-threads-shared perl-Scalar-List-Utils perl-libs util-linux libblkid libuuid grep pcre scratchbox2 libsb2 gawk glib2 file net-tools glibc-devel gcc libgomp glibc-headers kernel-headers binutils cpp mpc mpfr gmp findutils cpio rpmlint-mini make m4 gzip libcap openssl-libs qemu-usermode autoconf automake ccache qtchooser qt-qmake qt5-qmake python python-libs zip xz doxygen qt-tools qt5-tools fontconfig freetype expat cmake libarchive libcurl libxml2 libidn
%define cross_compilers cross-armv7tnhl-gcc cross-armv7tnhl-binutils
%global _python_bytecompile_errors_terminate_build 0

Name: sb2-tools-armv7tnhl
Version: 1.0
Expand Down
1 change: 1 addition & 0 deletions sb2-tools-i486.spec
Expand Up @@ -3,6 +3,7 @@
%define _build_name_fmt %%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.dontuse.rpm
%define packages_in_tools fakeroot bash bzip2 bzip2-libs coreutils db4 diffutils elfutils elfutils-libs elfutils-libelf fdupes file-libs filesystem glibc glibc-common groff libacl libattr libcap libgcc liblua libstdc++ ncurses-libs nspr nss nss-softokn-freebl pam popt readline rpm rpm rpm-build rpm-build rpm-devel rpm-libs rpm-libs sed setup sqlite tar xz-libs zlib perl perl-threads perl-threads-shared perl-Scalar-List-Utils perl-libs util-linux libblkid libuuid grep pcre scratchbox2 libsb2 gawk glib2 file net-tools glibc-devel gcc libgomp glibc-headers kernel-headers binutils cpp mpc mpfr gmp findutils cpio rpmlint-mini make m4 gzip libcap openssl-libs qemu-usermode autoconf automake ccache qtchooser qt-qmake qt5-qmake python python-libs zip xz doxygen qt-tools qt5-tools fontconfig freetype expat cmake libarchive libcurl libxml2 libidn
%define cross_compilers cross-i486-gcc cross-i486-binutils
%global _python_bytecompile_errors_terminate_build 0

Name: sb2-tools-i486
Version: 1.0
Expand Down
1 change: 1 addition & 0 deletions sb2-tools-mipsel.spec
Expand Up @@ -3,6 +3,7 @@
%define _build_name_fmt %%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.dontuse.rpm
%define packages_in_tools fakeroot bash bzip2 bzip2-libs coreutils db4 diffutils elfutils elfutils-libs elfutils-libelf fdupes file-libs filesystem glibc glibc-common groff libacl libattr libcap libgcc liblua libstdc++ ncurses-libs nspr nss nss-softokn-freebl pam popt readline rpm rpm rpm-build rpm-build rpm-devel rpm-libs rpm-libs sed setup sqlite tar xz-libs zlib perl perl-threads perl-threads-shared perl-Scalar-List-Utils perl-libs util-linux libblkid libuuid grep pcre scratchbox2 libsb2 gawk glib2 file net-tools glibc-devel gcc libgomp glibc-headers kernel-headers binutils cpp mpc mpfr gmp findutils cpio rpmlint-mini make m4 gzip libcap openssl-libs qemu-usermode autoconf automake ccache qtchooser qt-qmake qt5-qmake python python-libs zip xz doxygen qt-tools qt5-tools fontconfig freetype expat cmake libarchive libcurl libxml2 libidn
%define cross_compilers cross-mipsel-gcc cross-mipsel-binutils
%global _python_bytecompile_errors_terminate_build 0

Name: sb2-tools-mipsel
Version: 1.0
Expand Down
3 changes: 3 additions & 0 deletions sb2-tools-template.changes
@@ -1,3 +1,6 @@
* Fri Jun 13 2014 Carsten Munk <carsten.munk@jolla.com> - 1.0
- Fix python bytecompile failure

* Tue Jun 10 2014 Oleg Girko <oleg.girko@jolla.com> - 1.0
- Generate /etc/shadow and /etc/gshadow files instead of copying them

Expand Down
1 change: 1 addition & 0 deletions sb2-tools-template.spec
Expand Up @@ -3,6 +3,7 @@
%define _build_name_fmt %%{ARCH}/%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.dontuse.rpm
%define packages_in_tools fakeroot bash bzip2 bzip2-libs coreutils db4 diffutils elfutils elfutils-libs elfutils-libelf fdupes file-libs filesystem glibc glibc-common groff libacl libattr libcap libgcc liblua libstdc++ ncurses-libs nspr nss nss-softokn-freebl pam popt readline rpm rpm rpm-build rpm-build rpm-devel rpm-libs rpm-libs sed setup sqlite tar xz-libs zlib perl perl-threads perl-threads-shared perl-Scalar-List-Utils perl-libs util-linux libblkid libuuid grep pcre scratchbox2 libsb2 gawk glib2 file net-tools glibc-devel gcc libgomp glibc-headers kernel-headers binutils cpp mpc mpfr gmp findutils cpio rpmlint-mini make m4 gzip libcap openssl-libs qemu-usermode autoconf automake ccache qtchooser qt-qmake qt5-qmake python python-libs zip xz doxygen qt-tools qt5-tools fontconfig freetype expat cmake libarchive libcurl libxml2 libidn
%define cross_compilers cross-@ARCH@-gcc cross-@ARCH@-binutils
%global _python_bytecompile_errors_terminate_build 0

Name: sb2-tools-@ARCH@
Version: 1.0
Expand Down

0 comments on commit b823c3b

Please sign in to comment.