testing/aaa_base
SHA256
3
0
Fork 0
forked from pool/aaa_base
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/Base:System/aaa_base?expand=0&rev=140

Browse Source
This commit is contained in:
Thomas Renninger 2010-09-03 19:47:27 +00:00 committed by Git OBS Bridge
parent 3cbfee3600
commit 998acd2eae
3 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
aaa_base.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Fri Sep 3 19:43:51 UTC 2010 - trenn@novell.com
- Recognize "+" at the end of the kernel version correctly.
From mmarek:
Starting with 2.6.35, the kernel build by default appends a plus sign to
the kernel version string when building in a git tree that is not in a clean
tagged state.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Aug 27 15:05:22 CEST 2010 - ro@suse.de Fri Aug 27 15:05:22 CEST 2010 - ro@suse.de

5
aaa_base.spec
View File

@ -41,6 +41,7 @@ Source8: get_kernel_version.c
Source20: aaa_base-rpmlintrc Source20: aaa_base-rpmlintrc
Source21: aaa_base.pre Source21: aaa_base.pre
Source22: aaa_base.post Source22: aaa_base.post
Patch0: get_kernel_version_fix_plus_in_kernel_string.patch
%description %description
This package installs several important configuration files. Central This package installs several important configuration files. Central
@ -60,11 +61,15 @@ and convenience hacks).
%prep %prep
%setup -n aaa_base -b 5 -b 7 %setup -n aaa_base -b 5 -b 7
cd .. cd ..
mkdir -p scripts mkdir -p scripts
cp -v %{SOURCE21} scripts cp -v %{SOURCE21} scripts
cp -v %{SOURCE22} scripts cp -v %{SOURCE22} scripts
cd $RPM_SOURCE_DIR
%patch0 -p0
%build %build
gcc $RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 $RPM_SOURCE_DIR/get_kernel_version.c -o $RPM_SOURCE_DIR/get_kernel_version gcc $RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 $RPM_SOURCE_DIR/get_kernel_version.c -o $RPM_SOURCE_DIR/get_kernel_version

18
get_kernel_version_fix_plus_in_kernel_string.patch Normal file
View File

@ -0,0 +1,18 @@
From: Michal Marek <mmarek@suse.cz>
Subject: get_kernel_version: accept '+' in kernel version string
Starting with 2.6.35, the kernel build by default appends a plus sign to
the kernel version string when building in a git tree that is not in a clean
tagged state.
--- get_kernel_version.c~ 2010-09-02 22:34:31.000000000 +0200
+++ get_kernel_version.c 2010-09-02 22:34:47.000000000 +0200
@@ -26,7 +26,7 @@
static inline int my_is_alnum_punct(char c)
{
return isdigit(c) || (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')
- || c == '.' || c == ',' || c == '-' || c == '_';
+ || c == '.' || c == ',' || c == '-' || c == '_' || c == '+';
}
int