rpms
/
redhat-rpm-config
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Trim trailing whitespace

This commit is contained in:
Ville Skyttä 2014-04-27 11:58:18 +03:00
parent c73bd80489
commit 20a45694f9
7 changed files with 33 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
brp-java-repack-jars
View File

@ -14,16 +14,16 @@ if [ ! -x /usr/bin/unzip ]; then
fi fi
JARS=`find $RPM_BUILD_ROOT -type f -name \*.jar -not -size 0` JARS=`find $RPM_BUILD_ROOT -type f -name \*.jar -not -size 0`
if [ ! -z "$JARS" ]; then if [ ! -z "$JARS" ]; then
# make $RPM_BUILD_ROOT/tmp if it doesn't exist # make $RPM_BUILD_ROOT/tmp if it doesn't exist
rmtmp=0 rmtmp=0
if [ ! -x "$RPM_BUILD_ROOT/tmp" ]; then if [ ! -x "$RPM_BUILD_ROOT/tmp" ]; then
mkdir -p $RPM_BUILD_ROOT/tmp mkdir -p $RPM_BUILD_ROOT/tmp
rmtmp=1 rmtmp=1
fi fi
# unpack every jar, set the date of the files and directories and # unpack every jar, set the date of the files and directories and
# repack the jar # repack the jar
OLD_IFS="$IFS" OLD_IFS="$IFS"
IFS=$(printf '\n\t') IFS=$(printf '\n\t')
@ -32,17 +32,17 @@ if [ ! -z "$JARS" ]; then
JTMPDIR=`mktemp -d -p $RPM_BUILD_ROOT/tmp "$JARNAME.tmpdir.XXXXXXXXXX"` || exit 1 JTMPDIR=`mktemp -d -p $RPM_BUILD_ROOT/tmp "$JARNAME.tmpdir.XXXXXXXXXX"` || exit 1
JARDIR=`mktemp -d -p $RPM_BUILD_ROOT/tmp "$JARNAME.jardir.XXXXXXXXXX"` || exit 1 JARDIR=`mktemp -d -p $RPM_BUILD_ROOT/tmp "$JARNAME.jardir.XXXXXXXXXX"` || exit 1
TIMEREF=`mktemp -p $RPM_BUILD_ROOT/tmp "$JARNAME.timeref.XXXXXXXXXX"` || exit 1 TIMEREF=`mktemp -p $RPM_BUILD_ROOT/tmp "$JARNAME.timeref.XXXXXXXXXX"` || exit 1
pushd "$JTMPDIR" > /dev/null pushd "$JTMPDIR" > /dev/null
/usr/bin/unzip -qq -o "$j" /usr/bin/unzip -qq -o "$j"
find -type d -exec chmod a+rx,u+w {} \; find -type d -exec chmod a+rx,u+w {} \;
find -type f -exec chmod a+r,u+w {} \; find -type f -exec chmod a+r,u+w {} \;
rm -f "$j" rm -f "$j"
# Create the directories first. # Create the directories first.
find -type d | LC_ALL=C sort | while read d; do find -type d | LC_ALL=C sort | while read d; do
mkdir -p "$JARDIR/$d" mkdir -p "$JARDIR/$d"
done done
# Get the modtime from the newest ChangeLog. If the project # Get the modtime from the newest ChangeLog. If the project
# doesn't have a ChangeLog, Jan 1, 1970 will be used. # doesn't have a ChangeLog, Jan 1, 1970 will be used.
@ -61,7 +61,7 @@ if [ ! -z "$JARS" ]; then
DATE="$TMPDATE" DATE="$TMPDATE"
fi fi
done done
fi fi
fi fi
# move the contents over to the a new directory in order and set # move the contents over to the a new directory in order and set

24
kmodtool
View File

@ -88,16 +88,16 @@ get_rpmtemplate ()
if [ ! -z "$kmp_release" ]; then if [ ! -z "$kmp_release" ]; then
echo "Release: %{kmp_release}" echo "Release: %{kmp_release}"
fi fi
if [ ! -z "$kmp" ]; then if [ ! -z "$kmp" ]; then
echo "%global _use_internal_dependency_generator 0" echo "%global _use_internal_dependency_generator 0"
fi fi
cat <<EOF cat <<EOF
Provides: kernel-modules = ${verrel}${variant} Provides: kernel-modules = ${verrel}${variant}
Provides: ${kmod_name}-kmod = %{?epoch:%{epoch}:}%{version}-%{release} Provides: ${kmod_name}-kmod = %{?epoch:%{epoch}:}%{version}-%{release}
EOF EOF
if [ -z "$kmp" ]; then if [ -z "$kmp" ]; then
echo "Requires: ${kdep}" echo "Requires: ${kdep}"
fi fi
@ -131,7 +131,7 @@ if [ -e "/boot/System.map-${verrel}${variant}" ]; then
/sbin/depmod -aeF "/boot/System.map-${verrel}${variant}" "${verrel}${variant}" > /dev/null || : /sbin/depmod -aeF "/boot/System.map-${verrel}${variant}" "${verrel}${variant}" > /dev/null || :
fi fi
EOF EOF
if [ ! -z "$kmp" ]; then if [ ! -z "$kmp" ]; then
cat <<EOF cat <<EOF
@ -144,14 +144,14 @@ fi
rpm -ql kmod-${kmod_name}${dashvariant} | grep '\.ko$' \ rpm -ql kmod-${kmod_name}${dashvariant} | grep '\.ko$' \
> /var/run/rpm-kmod-${kmod_name}${dashvariant}-modules > /var/run/rpm-kmod-${kmod_name}${dashvariant}-modules
EOF EOF
fi fi
cat <<EOF cat <<EOF
%postun -n kmod-${kmod_name}${dashvariant} %postun -n kmod-${kmod_name}${dashvariant}
/sbin/depmod -aF /boot/System.map-${verrel}${variant} ${verrel}${variant} &> /dev/null || : /sbin/depmod -aF /boot/System.map-${verrel}${variant} ${verrel}${variant} &> /dev/null || :
EOF EOF
if [ ! -z "$kmp" ]; then if [ ! -z "$kmp" ]; then
cat <<EOF cat <<EOF
modules=( \$(cat /var/run/rpm-kmod-${kmod_name}${dashvariant}-modules) ) modules=( \$(cat /var/run/rpm-kmod-${kmod_name}${dashvariant}-modules) )
@ -192,7 +192,7 @@ print_rpmtemplate ()
echo "Couldn't find out the verrel." >&2 echo "Couldn't find out the verrel." >&2
exit 2 exit 2
fi fi
for variant in "$@" ; do for variant in "$@" ; do
if [ "default" == "$variant" ]; if [ "default" == "$variant" ];
then then
@ -210,15 +210,15 @@ You called: ${invocation}
Usage: ${myprog} <command> <option>+ Usage: ${myprog} <command> <option>+
Commands: Commands:
verrel <uname> verrel <uname>
- Get "base" version-release. - Get "base" version-release.
variant <uname> variant <uname>
- Get variant from uname. - Get variant from uname.
rpmtemplate <mainpgkname> <uname> <variants> rpmtemplate <mainpgkname> <uname> <variants>
- Return a template for use in a source RPM - Return a template for use in a source RPM
rpmtemplate_kmp <mainpgkname> <uname> <variants> rpmtemplate_kmp <mainpgkname> <uname> <variants>
- Return a template for use in a source RPM with KMP dependencies - Return a template for use in a source RPM with KMP dependencies
version version
- Output version number and exit. - Output version number and exit.
EOF EOF
} }

5
macros
View File

@ -188,7 +188,7 @@ package or when debugging this package.\
%__global_ldflags -Wl,-z,relro %{_hardened_ldflags} %__global_ldflags -Wl,-z,relro %{_hardened_ldflags}
#============================================================================== #==============================================================================
# ---- Generic auto req/prov filtering macros # ---- Generic auto req/prov filtering macros
# #
# http://fedoraproject.org/wiki/PackagingDrafts/AutoProvidesAndRequiresFiltering # http://fedoraproject.org/wiki/PackagingDrafts/AutoProvidesAndRequiresFiltering
@ -212,11 +212,10 @@ package or when debugging this package.\
%global __filter_from_req %{?__filter_from_req} | %{__sed} -e '%*' \ %global __filter_from_req %{?__filter_from_req} | %{__sed} -e '%*' \
} }
# actually set up the filtering bits # actually set up the filtering bits
%filter_setup %{expand: \ %filter_setup %{expand: \
%global _use_internal_dependency_generator 0 \ %global _use_internal_dependency_generator 0 \
%global __deploop() while read FILE; do echo "${FILE}" | /usr/lib/rpm/rpmdeps -%{1}; done | /bin/sort -u \ %global __deploop() while read FILE; do echo "${FILE}" | /usr/lib/rpm/rpmdeps -%{1}; done | /bin/sort -u \
%global __find_provides /bin/sh -c "%{?__filter_prov_cmd} %{__deploop P} %{?__filter_from_prov}" \ %global __find_provides /bin/sh -c "%{?__filter_prov_cmd} %{__deploop P} %{?__filter_from_prov}" \
%global __find_requires /bin/sh -c "%{?__filter_req_cmd} %{__deploop R} %{?__filter_from_req}" \ %global __find_requires /bin/sh -c "%{?__filter_req_cmd} %{__deploop R} %{?__filter_from_req}" \
} }

1
macros.kmp
View File

@ -60,4 +60,3 @@ kernel_module_package_release 1
fi \ fi \
kmp_override_filelist="$filelist" kmp_override_preamble="$preamble" kmp_nobuildreqs="$buildreqs" %{kmodtool} rpmtemplate_kmp %{-n*}%{!-n:%name} %{kverrel} $flavors_to_build 2>/dev/null \ kmp_override_filelist="$filelist" kmp_override_preamble="$preamble" kmp_nobuildreqs="$buildreqs" %{kmodtool} rpmtemplate_kmp %{-n*}%{!-n:%name} %{kverrel} $flavors_to_build 2>/dev/null \
)} )}

8
modalias.prov
View File

@ -8,12 +8,12 @@
IFS=$'\n' IFS=$'\n'
# #
# Initially, dont generate modalias() lines for kernel package. This needs # Initially, dont generate modalias() lines for kernel package. This needs
# additional discussion. Would like to eventually add them for # additional discussion. Would like to eventually add them for
# completeness, so that we can determine when drivers are folded into # completeness, so that we can determine when drivers are folded into
# mainline kernel. # mainline kernel.
# #
case "$1" in case "$1" in
kernel-module-*) ;; # Fedora kernel module package names start with kernel-module-*) ;; # Fedora kernel module package names start with
# kernel-module. # kernel-module.

14
redhat-rpm-config.spec
View File

@ -299,14 +299,14 @@ install -p -m 755 -t %{buildroot}%{_rpmconfigdir} kmod.prov
- add ghc_arches_with_ghci - add ghc_arches_with_ghci
* Wed Nov 09 2011 Dennis Gilmore <dennis@ausil.us> - 9.1.0-23 * Wed Nov 09 2011 Dennis Gilmore <dennis@ausil.us> - 9.1.0-23
- remove patch that forces --disable-silent-rules to configure - remove patch that forces --disable-silent-rules to configure
- it breaks anything set to not ignore unknown configure options - it breaks anything set to not ignore unknown configure options
* Tue Oct 18 2011 Jens Petersen <petersen@redhat.com> - 9.1.0-22 * Tue Oct 18 2011 Jens Petersen <petersen@redhat.com> - 9.1.0-22
- add armv5tel to ghc_arches - add armv5tel to ghc_arches
* Wed Sep 28 2011 Dennis Gilmore <dennis@ausil.us> - 9.1.0-21 * Wed Sep 28 2011 Dennis Gilmore <dennis@ausil.us> - 9.1.0-21
- build armv5tel on armv7l since they are the same abi armv7hl is - build armv5tel on armv7l since they are the same abi armv7hl is
- a incompatable ABI - a incompatable ABI
* Wed Sep 28 2011 Jens Petersen <petersen@redhat.com> - 9.1.0-20 * Wed Sep 28 2011 Jens Petersen <petersen@redhat.com> - 9.1.0-20
@ -424,7 +424,7 @@ install -p -m 755 -t %{buildroot}%{_rpmconfigdir} kmod.prov
- Resolves: #485826. - Resolves: #485826.
* Tue Feb 17 2009 Dennis Gilmore <dennis@ausil.us> - 9.0.3-6 * Tue Feb 17 2009 Dennis Gilmore <dennis@ausil.us> - 9.0.3-6
- add missing armv7l arch - add missing armv7l arch
- set the default build arch to match fedora arm build target - set the default build arch to match fedora arm build target
* Mon Feb 16 2009 Dennis Gilmore <dennis@ausil.us> - 9.0.3-5 * Mon Feb 16 2009 Dennis Gilmore <dennis@ausil.us> - 9.0.3-5
@ -483,7 +483,7 @@ install -p -m 755 -t %{buildroot}%{_rpmconfigdir} kmod.prov
Further debate may see these move elsewhere in the ordering. Further debate may see these move elsewhere in the ordering.
* Tue Mar 13 2007 Ben Konrath <bkonrath@redhat.com> 8.0.45-13 * Tue Mar 13 2007 Ben Konrath <bkonrath@redhat.com> 8.0.45-13
- Update brp-java-repack-jars to fix issue with tomcat. - Update brp-java-repack-jars to fix issue with tomcat.
* Wed Oct 18 2006 Jon Masters <jcm@redhat.com> 8.0.45-12 * Wed Oct 18 2006 Jon Masters <jcm@redhat.com> 8.0.45-12
- Synced kernel_module_package semantics with SuSE. - Synced kernel_module_package semantics with SuSE.
@ -505,13 +505,13 @@ install -p -m 755 -t %{buildroot}%{_rpmconfigdir} kmod.prov
- Fix order of tokens in find command (thanks mikeb@redhat.com) - Fix order of tokens in find command (thanks mikeb@redhat.com)
* Thu Sep 7 2006 Ben Konrath <bkonrath@redhat.com> - 8.0.45-4 * Thu Sep 7 2006 Ben Konrath <bkonrath@redhat.com> - 8.0.45-4
- Fix bug in repack jars script. - Fix bug in repack jars script.
* Wed Sep 6 2006 Jeremy Katz <katzj@redhat.com> - 8.0.45-3 * Wed Sep 6 2006 Jeremy Katz <katzj@redhat.com> - 8.0.45-3
- path fix - path fix
* Tue Sep 5 2006 Jeremy Katz <katzj@redhat.com> - 8.0.45-2 * Tue Sep 5 2006 Jeremy Katz <katzj@redhat.com> - 8.0.45-2
- Add script from Ben Konrath <bkonrath@redhat.com> to repack jars to - Add script from Ben Konrath <bkonrath@redhat.com> to repack jars to
avoid multilib conflicts avoid multilib conflicts
* Sun Jul 30 2006 Jon Masters <jcm@redhat.com> - 8.0.45-1 * Sun Jul 30 2006 Jon Masters <jcm@redhat.com> - 8.0.45-1
@ -661,7 +661,7 @@ install -p -m 755 -t %{buildroot}%{_rpmconfigdir} kmod.prov
- Update macrofiles - Update macrofiles
* Wed Jul 31 2002 Elliot Lee <sopwith@redhat.com> 7.3.93-1 * Wed Jul 31 2002 Elliot Lee <sopwith@redhat.com> 7.3.93-1
- Add _unpackaged_files_terminate_build and - Add _unpackaged_files_terminate_build and
_missing_doc_files_terminate_build to macros _missing_doc_files_terminate_build to macros
* Thu Jul 11 2002 Elliot Lee <sopwith@redhat.com> 7.3.92-6 * Thu Jul 11 2002 Elliot Lee <sopwith@redhat.com> 7.3.92-6

1
rpmrc
View File

@ -84,4 +84,3 @@ buildarchtranslate: armv6l: armv5tel
buildarchtranslate: armv7l: armv5tel buildarchtranslate: armv7l: armv5tel
buildarchtranslate: armv7hl: armv7hl buildarchtranslate: armv7hl: armv7hl
buildarchtranslate: armv7hnl: armv7hl buildarchtranslate: armv7hnl: armv7hl