debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

* debian/patches/debian/version.patch 

- Don't longer use debian/changelog and debian/official.
  - Get informations about uploader and official build via environment.
  - Get version from version.$dist file.
* debian/rules.real: Set informations about uploader and official build in the
  environment.

svn path=/dists/trunk/linux-2.6/; revision=8294
This commit is contained in:
Bastian Blank 2007-02-09 17:05:41 +00:00
parent 3efa5b96d0
commit 270455a7e7
2 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
debian/patches/debian/version.patch vendored
View File

@ -1,5 +1,5 @@
diff --git a/init/version.c b/init/version.c
index 6c01ec1..e1833e5 100644
index 6c01ec1..831993d 100644
--- a/init/version.c
+++ b/init/version.c
@@ -34,12 +34,31 @@ struct uts_namespace init_uts_ns = {
@ -11,13 +11,13 @@ index 6c01ec1..e1833e5 100644
- "Linux version " UTS_RELEASE " (" LINUX_COMPILE_BY "@"
- LINUX_COMPILE_HOST ") (" LINUX_COMPILER ") " UTS_VERSION "\n";
+ "Linux version " UTS_RELEASE
+#ifdef LINUX_COMPILE_SYSTEM_OFFICIAL
+ " (" LINUX_COMPILE_SYSTEM_DISTRIBUTION " "
+ LINUX_COMPILE_SYSTEM_VERSION ")"
+ " (" LINUX_COMPILE_SYSTEM_MAINTAINER ")"
+#ifdef LINUX_COMPILE_DISTRIBUTION_OFFICIAL_BUILD
+ " (" LINUX_COMPILE_DISTRIBUTION " "
+ LINUX_COMPILE_DISTRIBUTION_VERSION ")"
+ " (" LINUX_COMPILE_DISTRIBUTION_UPLOADER ")"
+#else
+# ifdef LINUX_COMPILE_SYSTEM_VERSION
+ " (" LINUX_COMPILE_SYSTEM_VERSION ")"
+# ifdef LINUX_COMPILE_DISTRIBUTION_VERSION
+ " (" LINUX_COMPILE_DISTRIBUTION_VERSION ")"
+# endif
+ " (" LINUX_COMPILE_BY "@" LINUX_COMPILE_HOST ")"
+#endif
@ -26,35 +26,24 @@ index 6c01ec1..e1833e5 100644
const char linux_proc_banner[] =
"%s version %s"
+#ifdef LINUX_COMPILE_SYSTEM_OFFICIAL
+ " (" LINUX_COMPILE_SYSTEM_DISTRIBUTION " "
+ LINUX_COMPILE_SYSTEM_VERSION ")"
+ " (" LINUX_COMPILE_SYSTEM_MAINTAINER ")"
+#ifdef LINUX_COMPILE_DISTRIBUTION_OFFICIAL_BUILD
+ " (" LINUX_COMPILE_DISTRIBUTION " "
+ LINUX_COMPILE_DISTRIBUTION_VERSION ")"
+ " (" LINUX_COMPILE_DISTRIBUTION_UPLOADER ")"
+#else
+# ifdef LINUX_COMPILE_SYSTEM_VERSION
+ " (" LINUX_COMPILE_SYSTEM_VERSION ")"
+# ifdef LINUX_COMPILE_DISTRIBUTION_VERSION
+ " (" LINUX_COMPILE_DISTRIBUTION_VERSION ")"
+# endif
" (" LINUX_COMPILE_BY "@" LINUX_COMPILE_HOST ")"
+#endif
" (" LINUX_COMPILER ") %s\n";
diff --git a/scripts/mkcompile_h b/scripts/mkcompile_h
index d7b8a38..87035a0 100755
index d7b8a38..540df31 100755
--- a/scripts/mkcompile_h
+++ b/scripts/mkcompile_h
@@ -46,16 +46,34 @@ UTS_TRUNCATE="sed -e s/\(.\{1,$UTS_LEN\}\).*/\1/"
@@ -47,15 +47,32 @@ UTS_TRUNCATE="sed -e s/\(.\{1,$UTS_LEN\}\).*/\1/"
echo \#define UTS_VERSION \"`echo $UTS_VERSION | $UTS_TRUNCATE`\"
+ if [ -e debian/changelog ]; then
+ DISTRIBUTION=$(lsb_release -is 2>/dev/null)
+ DISTRIBUTION=${DISTRIBUTION:-Debian}
+ MAINTAINER=$(dpkg-parsechangelog | sed -ne 's,^Maintainer: .[^<]*<\([^>]*\)>,\1,p')
+ VERSION=$(dpkg-parsechangelog | awk '/^Version:/ {print $$2}')
+ echo \#define LINUX_COMPILE_SYSTEM_DISTRIBUTION \"$DISTRIBUTION\"
+ echo \#define LINUX_COMPILE_SYSTEM_MAINTAINER \"$MAINTAINER\"
+ echo \#define LINUX_COMPILE_SYSTEM_VERSION \"$VERSION\"
+ fi
+
echo \#define LINUX_COMPILE_TIME \"`LC_ALL=C LANG=C date +%T`\"
- echo \#define LINUX_COMPILE_BY \"`whoami`\"
- echo \#define LINUX_COMPILE_HOST \"`hostname | $UTS_TRUNCATE`\"
@ -64,8 +53,17 @@ index d7b8a38..87035a0 100755
- elif [ -x /bin/domainname ]; then
- echo \#define LINUX_COMPILE_DOMAIN \"`domainname | $UTS_TRUNCATE`\"
- else
+ if [ -e debian/official ]; then
+ echo \#define LINUX_COMPILE_SYSTEM_OFFICIAL
+ DISTRIBUTION=$(lsb_release -is 2>/dev/null)
+ DISTRIBUTION=${DISTRIBUTION:-Debian}
+
+ if [ -e version.$DISTRIBUTION ]; then
+ echo \#define LINUX_COMPILE_DISTRIBUTION \"$DISTRIBUTION\"
+ echo \#define LINUX_COMPILE_DISTRIBUTION_VERSION \"$(cut -d" " -f1 version.$DISTRIBUTION)\"
+ fi
+
+ if [ "$DISTRIBUTION_OFFICIAL_BUILD" ]; then
+ echo \#define LINUX_COMPILE_DISTRIBUTION_OFFICIAL_BUILD
+ echo \#define LINUX_COMPILE_DISTRIBUTION_UPLOADER \"$DISTRIBUTION_UPLOADER\"
+ echo \#define LINUX_COMPILE_BY \"unknown\"
+ echo \#define LINUX_COMPILE_HOST \"$DISTRIBUTION\"
echo \#define LINUX_COMPILE_DOMAIN

3
debian/rules.real vendored
View File

@ -9,6 +9,7 @@ SHELL := bash -e
DEB_HOST_ARCH := $(shell dpkg-architecture -a'$(ARCH)' -qDEB_HOST_ARCH)
DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -a'$(ARCH)' -qDEB_HOST_GNU_TYPE)
DEB_BUILD_ARCH := $(shell dpkg-architecture -a'$(ARCH)' -qDEB_BUILD_ARCH)
UPLOADER := $(shell dpkg-parsechangelog | sed -ne 's,^Maintainer: .[^<]*<\([^>]*\)>,\1,p')
export PYTHONPATH = $(CURDIR)/debian/lib/python
export DH_OPTIONS
@ -51,6 +52,8 @@ ifdef DEBIAN_KERNEL_JOBS
JOBS_ARG = -j$(DEBIAN_KERNEL_JOBS)
endif
setup_env += DISTRIBUTION_OFFICIAL_BUILD=1 DISTRIBUTION_UPLOADER=$(UPLOADER)
#
# Targets
#