Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'jb36248' into 'sfos'
Jb36248



See merge request !3
  • Loading branch information
saukko committed Sep 13, 2016
2 parents 67649d3 + 2f0fa4a commit 77c0146
Show file tree
Hide file tree
Showing 11 changed files with 221 additions and 37 deletions.
3 changes: 2 additions & 1 deletion precheckin.sh
Expand Up @@ -3,5 +3,6 @@ ARCHS="armv6l armv7l armv7hl armv7thl armv7tnhl mipsel aarch64 i486"

for x in $ARCHS; do
cp -v sb2-tools-template-rpmlintrc sb2-tools-$x-rpmlintrc
sed "s/@ARCH@/$x/g" sb2-tools-template.spec | sed "s/ExclusiveArch: nothing//g" > sb2-tools-$x.spec
sed "s/@ARCH@/$x/g" sb2-tools-template.spec > sb2-tools-$x.spec
sed -i "s/Source2..: sb2-tools-$x\.spec//g" sb2-tools-$x.spec
done
28 changes: 24 additions & 4 deletions sb2-tools-aarch64.spec
Expand Up @@ -4,16 +4,34 @@
%define _target_cpu aarch64

Name: sb2-tools-aarch64-inject
Version: 1.0+git1
Version: 1.0+git2
Release: 1
AutoReqProv: 0
BuildRequires: rpm grep tar patchelf sed
BuildRequires: %packages_in_tools
BuildRequires: %cross_compilers

Source100: sb2-tools-aarch64-rpmlintrc
# We should build only on i586/i486 these packages, however
# ExclusiveArch: or ExcludeArch: do not work here, because after OBS starts building
# we set the _target_cpu above to e.g. armv7hl and then rpm declines to build the package.
Source101: precheckin.sh

Source200: sb2-tools-template-rpmlintrc
Source201: sb2-tools-template.spec
Source202: sb2-tools-armv6l-rpmlintrc
Source203: sb2-tools-armv6l.spec
Source204: sb2-tools-armv7l-rpmlintrc
Source205: sb2-tools-armv7l.spec
Source206: sb2-tools-armv7hl-rpmlintrc
Source207: sb2-tools-armv7hl.spec
Source208: sb2-tools-armv7thl-rpmlintrc
Source209: sb2-tools-armv7thl.spec
Source210: sb2-tools-armv7tnhl-rpmlintrc
Source211: sb2-tools-armv7tnhl.spec
Source212: sb2-tools-mipsel-rpmlintrc
Source213: sb2-tools-mipsel.spec
Source214: sb2-tools-aarch64-rpmlintrc

Source216: sb2-tools-i486-rpmlintrc
Source217: sb2-tools-i486.spec
# no auto requirements - they're generated
License: BSD
Group: Development/Tools
Expand Down Expand Up @@ -64,7 +82,9 @@ cat > filestoignore << EOF
/var/lock/subsys
EOF
grep -vf filestoignore filestoinclude1 | sort | uniq > filestoinclude2
# Copy files to buildroot and preserve permissions.
tar --no-recursion -T filestoinclude2 -cpf - | ( cd %buildroot && fakeroot tar -xvpf - )
# Add quotas around the lines as filenames contain spaces.
sed -i "s/^\(.*\)$/\"\1\"/g" filestoinclude2
cat filestoinclude2
sed 's|:.*$|:*:16229:0:99999:7:::|' < /etc/passwd > %{buildroot}/etc/shadow
Expand Down
28 changes: 24 additions & 4 deletions sb2-tools-armv6l.spec
Expand Up @@ -4,16 +4,34 @@
%define _target_cpu armv6l

Name: sb2-tools-armv6l-inject
Version: 1.0+git1
Version: 1.0+git2
Release: 1
AutoReqProv: 0
BuildRequires: rpm grep tar patchelf sed
BuildRequires: %packages_in_tools
BuildRequires: %cross_compilers

Source100: sb2-tools-armv6l-rpmlintrc
# We should build only on i586/i486 these packages, however
# ExclusiveArch: or ExcludeArch: do not work here, because after OBS starts building
# we set the _target_cpu above to e.g. armv7hl and then rpm declines to build the package.
Source101: precheckin.sh

Source200: sb2-tools-template-rpmlintrc
Source201: sb2-tools-template.spec
Source202: sb2-tools-armv6l-rpmlintrc

Source204: sb2-tools-armv7l-rpmlintrc
Source205: sb2-tools-armv7l.spec
Source206: sb2-tools-armv7hl-rpmlintrc
Source207: sb2-tools-armv7hl.spec
Source208: sb2-tools-armv7thl-rpmlintrc
Source209: sb2-tools-armv7thl.spec
Source210: sb2-tools-armv7tnhl-rpmlintrc
Source211: sb2-tools-armv7tnhl.spec
Source212: sb2-tools-mipsel-rpmlintrc
Source213: sb2-tools-mipsel.spec
Source214: sb2-tools-aarch64-rpmlintrc
Source215: sb2-tools-aarch64.spec
Source216: sb2-tools-i486-rpmlintrc
Source217: sb2-tools-i486.spec
# no auto requirements - they're generated
License: BSD
Group: Development/Tools
Expand Down Expand Up @@ -64,7 +82,9 @@ cat > filestoignore << EOF
/var/lock/subsys
EOF
grep -vf filestoignore filestoinclude1 | sort | uniq > filestoinclude2
# Copy files to buildroot and preserve permissions.
tar --no-recursion -T filestoinclude2 -cpf - | ( cd %buildroot && fakeroot tar -xvpf - )
# Add quotas around the lines as filenames contain spaces.
sed -i "s/^\(.*\)$/\"\1\"/g" filestoinclude2
cat filestoinclude2
sed 's|:.*$|:*:16229:0:99999:7:::|' < /etc/passwd > %{buildroot}/etc/shadow
Expand Down
28 changes: 24 additions & 4 deletions sb2-tools-armv7hl.spec
Expand Up @@ -4,16 +4,34 @@
%define _target_cpu armv7hl

Name: sb2-tools-armv7hl-inject
Version: 1.0+git1
Version: 1.0+git2
Release: 1
AutoReqProv: 0
BuildRequires: rpm grep tar patchelf sed
BuildRequires: %packages_in_tools
BuildRequires: %cross_compilers

Source100: sb2-tools-armv7hl-rpmlintrc
# We should build only on i586/i486 these packages, however
# ExclusiveArch: or ExcludeArch: do not work here, because after OBS starts building
# we set the _target_cpu above to e.g. armv7hl and then rpm declines to build the package.
Source101: precheckin.sh

Source200: sb2-tools-template-rpmlintrc
Source201: sb2-tools-template.spec
Source202: sb2-tools-armv6l-rpmlintrc
Source203: sb2-tools-armv6l.spec
Source204: sb2-tools-armv7l-rpmlintrc
Source205: sb2-tools-armv7l.spec
Source206: sb2-tools-armv7hl-rpmlintrc

Source208: sb2-tools-armv7thl-rpmlintrc
Source209: sb2-tools-armv7thl.spec
Source210: sb2-tools-armv7tnhl-rpmlintrc
Source211: sb2-tools-armv7tnhl.spec
Source212: sb2-tools-mipsel-rpmlintrc
Source213: sb2-tools-mipsel.spec
Source214: sb2-tools-aarch64-rpmlintrc
Source215: sb2-tools-aarch64.spec
Source216: sb2-tools-i486-rpmlintrc
Source217: sb2-tools-i486.spec
# no auto requirements - they're generated
License: BSD
Group: Development/Tools
Expand Down Expand Up @@ -64,7 +82,9 @@ cat > filestoignore << EOF
/var/lock/subsys
EOF
grep -vf filestoignore filestoinclude1 | sort | uniq > filestoinclude2
# Copy files to buildroot and preserve permissions.
tar --no-recursion -T filestoinclude2 -cpf - | ( cd %buildroot && fakeroot tar -xvpf - )
# Add quotas around the lines as filenames contain spaces.
sed -i "s/^\(.*\)$/\"\1\"/g" filestoinclude2
cat filestoinclude2
sed 's|:.*$|:*:16229:0:99999:7:::|' < /etc/passwd > %{buildroot}/etc/shadow
Expand Down
28 changes: 24 additions & 4 deletions sb2-tools-armv7l.spec
Expand Up @@ -4,16 +4,34 @@
%define _target_cpu armv7l

Name: sb2-tools-armv7l-inject
Version: 1.0+git1
Version: 1.0+git2
Release: 1
AutoReqProv: 0
BuildRequires: rpm grep tar patchelf sed
BuildRequires: %packages_in_tools
BuildRequires: %cross_compilers

Source100: sb2-tools-armv7l-rpmlintrc
# We should build only on i586/i486 these packages, however
# ExclusiveArch: or ExcludeArch: do not work here, because after OBS starts building
# we set the _target_cpu above to e.g. armv7hl and then rpm declines to build the package.
Source101: precheckin.sh

Source200: sb2-tools-template-rpmlintrc
Source201: sb2-tools-template.spec
Source202: sb2-tools-armv6l-rpmlintrc
Source203: sb2-tools-armv6l.spec
Source204: sb2-tools-armv7l-rpmlintrc

Source206: sb2-tools-armv7hl-rpmlintrc
Source207: sb2-tools-armv7hl.spec
Source208: sb2-tools-armv7thl-rpmlintrc
Source209: sb2-tools-armv7thl.spec
Source210: sb2-tools-armv7tnhl-rpmlintrc
Source211: sb2-tools-armv7tnhl.spec
Source212: sb2-tools-mipsel-rpmlintrc
Source213: sb2-tools-mipsel.spec
Source214: sb2-tools-aarch64-rpmlintrc
Source215: sb2-tools-aarch64.spec
Source216: sb2-tools-i486-rpmlintrc
Source217: sb2-tools-i486.spec
# no auto requirements - they're generated
License: BSD
Group: Development/Tools
Expand Down Expand Up @@ -64,7 +82,9 @@ cat > filestoignore << EOF
/var/lock/subsys
EOF
grep -vf filestoignore filestoinclude1 | sort | uniq > filestoinclude2
# Copy files to buildroot and preserve permissions.
tar --no-recursion -T filestoinclude2 -cpf - | ( cd %buildroot && fakeroot tar -xvpf - )
# Add quotas around the lines as filenames contain spaces.
sed -i "s/^\(.*\)$/\"\1\"/g" filestoinclude2
cat filestoinclude2
sed 's|:.*$|:*:16229:0:99999:7:::|' < /etc/passwd > %{buildroot}/etc/shadow
Expand Down
28 changes: 24 additions & 4 deletions sb2-tools-armv7thl.spec
Expand Up @@ -4,16 +4,34 @@
%define _target_cpu armv7thl

Name: sb2-tools-armv7thl-inject
Version: 1.0+git1
Version: 1.0+git2
Release: 1
AutoReqProv: 0
BuildRequires: rpm grep tar patchelf sed
BuildRequires: %packages_in_tools
BuildRequires: %cross_compilers

Source100: sb2-tools-armv7thl-rpmlintrc
# We should build only on i586/i486 these packages, however
# ExclusiveArch: or ExcludeArch: do not work here, because after OBS starts building
# we set the _target_cpu above to e.g. armv7hl and then rpm declines to build the package.
Source101: precheckin.sh

Source200: sb2-tools-template-rpmlintrc
Source201: sb2-tools-template.spec
Source202: sb2-tools-armv6l-rpmlintrc
Source203: sb2-tools-armv6l.spec
Source204: sb2-tools-armv7l-rpmlintrc
Source205: sb2-tools-armv7l.spec
Source206: sb2-tools-armv7hl-rpmlintrc
Source207: sb2-tools-armv7hl.spec
Source208: sb2-tools-armv7thl-rpmlintrc

Source210: sb2-tools-armv7tnhl-rpmlintrc
Source211: sb2-tools-armv7tnhl.spec
Source212: sb2-tools-mipsel-rpmlintrc
Source213: sb2-tools-mipsel.spec
Source214: sb2-tools-aarch64-rpmlintrc
Source215: sb2-tools-aarch64.spec
Source216: sb2-tools-i486-rpmlintrc
Source217: sb2-tools-i486.spec
# no auto requirements - they're generated
License: BSD
Group: Development/Tools
Expand Down Expand Up @@ -64,7 +82,9 @@ cat > filestoignore << EOF
/var/lock/subsys
EOF
grep -vf filestoignore filestoinclude1 | sort | uniq > filestoinclude2
# Copy files to buildroot and preserve permissions.
tar --no-recursion -T filestoinclude2 -cpf - | ( cd %buildroot && fakeroot tar -xvpf - )
# Add quotas around the lines as filenames contain spaces.
sed -i "s/^\(.*\)$/\"\1\"/g" filestoinclude2
cat filestoinclude2
sed 's|:.*$|:*:16229:0:99999:7:::|' < /etc/passwd > %{buildroot}/etc/shadow
Expand Down
28 changes: 24 additions & 4 deletions sb2-tools-armv7tnhl.spec
Expand Up @@ -4,16 +4,34 @@
%define _target_cpu armv7tnhl

Name: sb2-tools-armv7tnhl-inject
Version: 1.0+git1
Version: 1.0+git2
Release: 1
AutoReqProv: 0
BuildRequires: rpm grep tar patchelf sed
BuildRequires: %packages_in_tools
BuildRequires: %cross_compilers

Source100: sb2-tools-armv7tnhl-rpmlintrc
# We should build only on i586/i486 these packages, however
# ExclusiveArch: or ExcludeArch: do not work here, because after OBS starts building
# we set the _target_cpu above to e.g. armv7hl and then rpm declines to build the package.
Source101: precheckin.sh

Source200: sb2-tools-template-rpmlintrc
Source201: sb2-tools-template.spec
Source202: sb2-tools-armv6l-rpmlintrc
Source203: sb2-tools-armv6l.spec
Source204: sb2-tools-armv7l-rpmlintrc
Source205: sb2-tools-armv7l.spec
Source206: sb2-tools-armv7hl-rpmlintrc
Source207: sb2-tools-armv7hl.spec
Source208: sb2-tools-armv7thl-rpmlintrc
Source209: sb2-tools-armv7thl.spec
Source210: sb2-tools-armv7tnhl-rpmlintrc

Source212: sb2-tools-mipsel-rpmlintrc
Source213: sb2-tools-mipsel.spec
Source214: sb2-tools-aarch64-rpmlintrc
Source215: sb2-tools-aarch64.spec
Source216: sb2-tools-i486-rpmlintrc
Source217: sb2-tools-i486.spec
# no auto requirements - they're generated
License: BSD
Group: Development/Tools
Expand Down Expand Up @@ -64,7 +82,9 @@ cat > filestoignore << EOF
/var/lock/subsys
EOF
grep -vf filestoignore filestoinclude1 | sort | uniq > filestoinclude2
# Copy files to buildroot and preserve permissions.
tar --no-recursion -T filestoinclude2 -cpf - | ( cd %buildroot && fakeroot tar -xvpf - )
# Add quotas around the lines as filenames contain spaces.
sed -i "s/^\(.*\)$/\"\1\"/g" filestoinclude2
cat filestoinclude2
sed 's|:.*$|:*:16229:0:99999:7:::|' < /etc/passwd > %{buildroot}/etc/shadow
Expand Down
28 changes: 24 additions & 4 deletions sb2-tools-i486.spec
Expand Up @@ -4,16 +4,34 @@
%define _target_cpu i486

Name: sb2-tools-i486-inject
Version: 1.0+git1
Version: 1.0+git2
Release: 1
AutoReqProv: 0
BuildRequires: rpm grep tar patchelf sed
BuildRequires: %packages_in_tools
BuildRequires: %cross_compilers

Source100: sb2-tools-i486-rpmlintrc
# We should build only on i586/i486 these packages, however
# ExclusiveArch: or ExcludeArch: do not work here, because after OBS starts building
# we set the _target_cpu above to e.g. armv7hl and then rpm declines to build the package.
Source101: precheckin.sh

Source200: sb2-tools-template-rpmlintrc
Source201: sb2-tools-template.spec
Source202: sb2-tools-armv6l-rpmlintrc
Source203: sb2-tools-armv6l.spec
Source204: sb2-tools-armv7l-rpmlintrc
Source205: sb2-tools-armv7l.spec
Source206: sb2-tools-armv7hl-rpmlintrc
Source207: sb2-tools-armv7hl.spec
Source208: sb2-tools-armv7thl-rpmlintrc
Source209: sb2-tools-armv7thl.spec
Source210: sb2-tools-armv7tnhl-rpmlintrc
Source211: sb2-tools-armv7tnhl.spec
Source212: sb2-tools-mipsel-rpmlintrc
Source213: sb2-tools-mipsel.spec
Source214: sb2-tools-aarch64-rpmlintrc
Source215: sb2-tools-aarch64.spec
Source216: sb2-tools-i486-rpmlintrc

# no auto requirements - they're generated
License: BSD
Group: Development/Tools
Expand Down Expand Up @@ -64,7 +82,9 @@ cat > filestoignore << EOF
/var/lock/subsys
EOF
grep -vf filestoignore filestoinclude1 | sort | uniq > filestoinclude2
# Copy files to buildroot and preserve permissions.
tar --no-recursion -T filestoinclude2 -cpf - | ( cd %buildroot && fakeroot tar -xvpf - )
# Add quotas around the lines as filenames contain spaces.
sed -i "s/^\(.*\)$/\"\1\"/g" filestoinclude2
cat filestoinclude2
sed 's|:.*$|:*:16229:0:99999:7:::|' < /etc/passwd > %{buildroot}/etc/shadow
Expand Down
28 changes: 24 additions & 4 deletions sb2-tools-mipsel.spec
Expand Up @@ -4,16 +4,34 @@
%define _target_cpu mipsel

Name: sb2-tools-mipsel-inject
Version: 1.0+git1
Version: 1.0+git2
Release: 1
AutoReqProv: 0
BuildRequires: rpm grep tar patchelf sed
BuildRequires: %packages_in_tools
BuildRequires: %cross_compilers

Source100: sb2-tools-mipsel-rpmlintrc
# We should build only on i586/i486 these packages, however
# ExclusiveArch: or ExcludeArch: do not work here, because after OBS starts building
# we set the _target_cpu above to e.g. armv7hl and then rpm declines to build the package.
Source101: precheckin.sh

Source200: sb2-tools-template-rpmlintrc
Source201: sb2-tools-template.spec
Source202: sb2-tools-armv6l-rpmlintrc
Source203: sb2-tools-armv6l.spec
Source204: sb2-tools-armv7l-rpmlintrc
Source205: sb2-tools-armv7l.spec
Source206: sb2-tools-armv7hl-rpmlintrc
Source207: sb2-tools-armv7hl.spec
Source208: sb2-tools-armv7thl-rpmlintrc
Source209: sb2-tools-armv7thl.spec
Source210: sb2-tools-armv7tnhl-rpmlintrc
Source211: sb2-tools-armv7tnhl.spec
Source212: sb2-tools-mipsel-rpmlintrc

Source214: sb2-tools-aarch64-rpmlintrc
Source215: sb2-tools-aarch64.spec
Source216: sb2-tools-i486-rpmlintrc
Source217: sb2-tools-i486.spec
# no auto requirements - they're generated
License: BSD
Group: Development/Tools
Expand Down Expand Up @@ -64,7 +82,9 @@ cat > filestoignore << EOF
/var/lock/subsys
EOF
grep -vf filestoignore filestoinclude1 | sort | uniq > filestoinclude2
# Copy files to buildroot and preserve permissions.
tar --no-recursion -T filestoinclude2 -cpf - | ( cd %buildroot && fakeroot tar -xvpf - )
# Add quotas around the lines as filenames contain spaces.
sed -i "s/^\(.*\)$/\"\1\"/g" filestoinclude2
cat filestoinclude2
sed 's|:.*$|:*:16229:0:99999:7:::|' < /etc/passwd > %{buildroot}/etc/shadow
Expand Down

0 comments on commit 77c0146

Please sign in to comment.