[Pkg-fglrx-devel] r1583 - in fglrx-driver/trunk: . debian debian/patches
Andreas Beckmann
anbe at moszumanska.debian.org
Fri Jan 22 15:32:33 UTC 2016
Author: anbe
Date: 2016-01-22 15:32:33 +0000 (Fri, 22 Jan 2016)
New Revision: 1583
Removed:
fglrx-driver/trunk/debian/patches/04-3.17rc6-no_hotplug.patch
fglrx-driver/trunk/debian/patches/05-4.0.0-build.patch
fglrx-driver/trunk/debian/patches/07-4.1.0-build.patch
fglrx-driver/trunk/debian/patches/08-4.2.0-build.patch
fglrx-driver/trunk/debian/patches/09-4.2.0-build.fpregs_active.patch
fglrx-driver/trunk/debian/patches/11-4.1.0-gpl-only.patch
Modified:
fglrx-driver/trunk/
fglrx-driver/trunk/debian/amd-libopencl1.lintian-overrides
fglrx-driver/trunk/debian/amd-libopencl1.symbols
fglrx-driver/trunk/debian/changelog
fglrx-driver/trunk/debian/control
fglrx-driver/trunk/debian/copyright
fglrx-driver/trunk/debian/patches/series
fglrx-driver/trunk/debian/rules
fglrx-driver/trunk/debian/rules.defs
Log:
merge branches/15.12 into trunk
Property changes on: fglrx-driver/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /fglrx-driver/branches/15.9-jessie:1538-1581
+ /fglrx-driver/branches/15.12:1569-1582
/fglrx-driver/branches/15.9-jessie:1538-1581
Modified: fglrx-driver/trunk/debian/amd-libopencl1.lintian-overrides
===================================================================
--- fglrx-driver/trunk/debian/amd-libopencl1.lintian-overrides 2016-01-22 15:26:37 UTC (rev 1582)
+++ fglrx-driver/trunk/debian/amd-libopencl1.lintian-overrides 2016-01-22 15:32:33 UTC (rev 1583)
@@ -10,3 +10,4 @@
symbols-declares-dependency-on-other-package ocl-icd-libopencl1
symbols-declares-dependency-on-other-package ocl-icd-libopencl1 (>= 1.0)
symbols-declares-dependency-on-other-package ocl-icd-libopencl1 (>= 2.2.0)
+symbols-declares-dependency-on-other-package ocl-icd-libopencl1 (>= 2.2.8)
Modified: fglrx-driver/trunk/debian/amd-libopencl1.symbols
===================================================================
--- fglrx-driver/trunk/debian/amd-libopencl1.symbols 2016-01-22 15:26:37 UTC (rev 1582)
+++ fglrx-driver/trunk/debian/amd-libopencl1.symbols 2016-01-22 15:32:33 UTC (rev 1583)
@@ -28,9 +28,11 @@
| ocl-icd-libopencl1 (>= 1.0) | #PACKAGE# #MINVER# | libopencl-1.1-1
| ocl-icd-libopencl1 (>= 1.0) | #PACKAGE# #MINVER# | libopencl-1.2-1
| ocl-icd-libopencl1 (>= 2.2.0) | #PACKAGE# #MINVER# | libopencl-2.0-1
+| ocl-icd-libopencl1 (>= 2.2.8) | #PACKAGE# #MINVER# | libopencl-2.1-1
# As AMD uses versioned symbols, we use this information instead of
# listing all symbols.
(symver|optional)OPENCL_1.0 0 2
(symver|optional)OPENCL_1.1 0 2
(symver|optional)OPENCL_1.2 0 3
(symver|optional)OPENCL_2.0 1:14 4
+ (symver|optional)OPENCL_2.1 1:15.12 5
Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog 2016-01-22 15:26:37 UTC (rev 1582)
+++ fglrx-driver/trunk/debian/changelog 2016-01-22 15:32:33 UTC (rev 1583)
@@ -1,3 +1,20 @@
+fglrx-driver (1:15.12-1) experimental; urgency=medium
+
+ * New upstream release 15.12 (2015-12-18) (15.302).
+ (Closes: #807575, #809638)
+ * get-orig-source: Generate tarball reproducibly.
+ * Use signature from 15.7.
+ * amd-libopencl1: Now supports OpenCL 2.1, too.
+ * Drop patches 04-3.17rc6-no_hotplug, 05-4.0.0-build, 07-4.1.0-build,
+ 08-4.2.0-build, 09-4.2.0-build.fpregs_active, 11-4.1.0-gpl-only: fixed
+ upstream.
+ * Disable patch 10-4.2.0-build.copy_xregs_to_kernel: seems to be no longer
+ necessary.
+ * Drop support for squeeze-backports.
+ * Upload to experimental.
+
+ -- Andreas Beckmann <anbe at debian.org> Mon, 18 Jan 2016 01:25:23 +0100
+
fglrx-driver (1:15.9-4~deb8u1) jessie; urgency=medium
* Rebuild for jessie.
Modified: fglrx-driver/trunk/debian/control
===================================================================
--- fglrx-driver/trunk/debian/control 2016-01-22 15:26:37 UTC (rev 1582)
+++ fglrx-driver/trunk/debian/control 2016-01-22 15:32:33 UTC (rev 1583)
@@ -343,6 +343,7 @@
libopencl-1.1-1,
libopencl-1.2-1,
libopencl-2.0-1,
+ libopencl-2.1-1,
Conflicts:
libopencl1,
amd-app,
Modified: fglrx-driver/trunk/debian/copyright
===================================================================
--- fglrx-driver/trunk/debian/copyright 2016-01-22 15:26:37 UTC (rev 1582)
+++ fglrx-driver/trunk/debian/copyright 2016-01-22 15:32:33 UTC (rev 1583)
@@ -10,7 +10,7 @@
Files: *
Copyright: Advanced Micro Devices, Inc.
- Copyright 1998-2011 ATI Technologies Inc.
+ Copyright 1998-2015 ATI Technologies Inc.
All Rights Reserved.
License: other-AMD-FGLRX
AMD Software End User License Agreement
@@ -206,7 +206,7 @@
2008-2010 Bertrand Marc
2009-2011 Patrick Matthäi <pmatthaei at debian.org>
2009-2011 Michael Gilbert <michael.s.gilbert at gmail.com>
- © 2011-2013 Andreas Beckmann <anbe at debian.org>
+ © 2011-2016 Andreas Beckmann <anbe at debian.org>
License: GPL-2+
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Deleted: fglrx-driver/trunk/debian/patches/04-3.17rc6-no_hotplug.patch
===================================================================
--- fglrx-driver/trunk/debian/patches/04-3.17rc6-no_hotplug.patch 2016-01-22 15:26:37 UTC (rev 1582)
+++ fglrx-driver/trunk/debian/patches/04-3.17rc6-no_hotplug.patch 2016-01-22 15:32:33 UTC (rev 1583)
@@ -1,31 +0,0 @@
-# Fix building with Linux 3.17.
-
-diff -Naur fglrx-driver-15.9.orig/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-driver-15.9/common/lib/modules/fglrx/build_mod/firegl_public.c
---- fglrx-driver-15.9.orig/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-09-09 00:57:14.000000000 +0200
-+++ fglrx-driver-15.9/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-09-27 10:39:09.390175314 +0200
-@@ -1112,6 +1112,9 @@
- // directly here to allow suspend/resume without X server start.
- firegl_pci_save_state((KCL_PCI_DevHandle)pdev, privdev);
- pci_disable_device(pdev);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0)
-+ pci_ignore_hotplug(pdev);
-+#endif
- PMSG_EVENT(pdev->dev.power.power_state) = state;
- }
- else
-diff -Naur fglrx-driver-15.9.orig/common/lib/modules/fglrx/build_mod/kcl_acpi.c fglrx-driver-15.9/common/lib/modules/fglrx/build_mod/kcl_acpi.c
---- fglrx-driver-15.9.orig/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2015-09-09 00:57:14.000000000 +0200
-+++ fglrx-driver-15.9/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2015-09-27 10:39:09.390175314 +0200
-@@ -847,10 +847,12 @@
- if(tdev != NULL)
- {
- device = (acpi_device_adr(tdev) >> 16) & 0xffff;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0)
- if(PCI_SLOT(pdev->devfn) == device)
- {
- tdev->flags.no_hotplug = true;
- }
-+#endif
- }
- #endif
- return 0;
Deleted: fglrx-driver/trunk/debian/patches/05-4.0.0-build.patch
===================================================================
--- fglrx-driver/trunk/debian/patches/05-4.0.0-build.patch 2016-01-22 15:26:37 UTC (rev 1582)
+++ fglrx-driver/trunk/debian/patches/05-4.0.0-build.patch 2016-01-22 15:32:33 UTC (rev 1583)
@@ -1,33 +0,0 @@
-# Patch to fix FTBFS with Linux 4.0.0.
-# Thanks to Michael Rasmussen <mir at datanom.net>.
-# Closes: #785150
-
-diff -Naur fglrx-driver-15.9.orig/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-driver-15.9/common/lib/modules/fglrx/build_mod/firegl_public.c
---- fglrx-driver-15.9.orig/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-09-27 10:44:41.292458241 +0200
-+++ fglrx-driver-15.9/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-09-27 10:43:51.189345210 +0200
-@@ -285,6 +285,11 @@
-
- MODULE_INFO(supported, "external");
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 20, 0)
-+#define read_cr4() __read_cr4()
-+#define write_cr4(cr4) __write_cr4(cr4)
-+#endif
-+
- /* globals constants */
- const char* KCL_SYSINFO_OsVersionString = UTS_RELEASE;
- const unsigned int KCL_SYSINFO_PageSize = PAGE_SIZE;
-diff -Naur fglrx-driver-15.9.orig/common/lib/modules/fglrx/build_mod/kcl_str.c fglrx-driver-15.9/common/lib/modules/fglrx/build_mod/kcl_str.c
---- fglrx-driver-15.9.orig/common/lib/modules/fglrx/build_mod/kcl_str.c 2015-09-09 00:57:14.000000000 +0200
-+++ fglrx-driver-15.9/common/lib/modules/fglrx/build_mod/kcl_str.c 2015-09-27 10:43:51.189345210 +0200
-@@ -42,6 +42,10 @@
- #include "kcl_type.h"
- #include "kcl_str.h"
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 20, 0)
-+#define strnicmp strncasecmp
-+#endif
-+
- /** \brief Fill memory with a constant byte
- * \param s Pointer to memory
- * \param c Initializing value
Deleted: fglrx-driver/trunk/debian/patches/07-4.1.0-build.patch
===================================================================
--- fglrx-driver/trunk/debian/patches/07-4.1.0-build.patch 2016-01-22 15:26:37 UTC (rev 1582)
+++ fglrx-driver/trunk/debian/patches/07-4.1.0-build.patch 2016-01-22 15:32:33 UTC (rev 1583)
@@ -1,25 +0,0 @@
-From 94631bfd9b813d9d2f1af0ea744e7121d72d25c5 Mon Sep 17 00:00:00 2001
-From: Alberto Milone <alberto.milone at canonical.com>
-Date: Fri, 10 Jul 2015 16:52:29 +0200
-Subject: [PATCH 1/2] Add support for Linux 4.1
-
-Drop the IRQF_DISABLED flag, as it was removed in Linux 4.1
-
-Signed-off-by: Alberto Milone <alberto.milone at canonical.com>
-diff -Naur fglrx-driver-15.9.orig/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-driver-15.9/common/lib/modules/fglrx/build_mod/firegl_public.c
---- fglrx-driver-15.9.orig/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-09-27 10:45:53.915161112 +0200
-+++ fglrx-driver-15.9/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-09-27 10:51:18.421239216 +0200
-@@ -3511,10 +3511,12 @@
- KCL_PUB_InterruptHandlerWrap,
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
- ((useMSI) ? (SA_INTERRUPT) : (SA_SHIRQ)),
--#else
-+#elif LINUX_VERSION_CODE < KERNEL_VERSION(4,1,0)
- //when MSI enabled. keep irq disabled when calling the action handler,
- //exclude this IRQ from irq balancing (only on one CPU)
- ((useMSI) ? (IRQF_DISABLED) : (IRQF_SHARED)),
-+#else
-+ ((useMSI) ? (0x0) : (IRQF_SHARED)),
- #endif
- dev_name,
- context);
Deleted: fglrx-driver/trunk/debian/patches/08-4.2.0-build.patch
===================================================================
--- fglrx-driver/trunk/debian/patches/08-4.2.0-build.patch 2016-01-22 15:26:37 UTC (rev 1582)
+++ fglrx-driver/trunk/debian/patches/08-4.2.0-build.patch 2016-01-22 15:32:33 UTC (rev 1583)
@@ -1,110 +0,0 @@
-From eb7beb0ea51de526e59a0c3edc76530b28ef10e7 Mon Sep 17 00:00:00 2001
-From: Alberto Milone <alberto.milone at canonical.com>
-Date: Tue, 14 Jul 2015 12:56:37 +0200
-Subject: [PATCH 1/1] Add support for Linux 4.2
-
-diff -Naur fglrx-driver-15.9.orig/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-driver-15.9/common/lib/modules/fglrx/build_mod/firegl_public.c
---- fglrx-driver-15.9.orig/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-09-27 10:54:11.858303746 +0200
-+++ fglrx-driver-15.9/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-09-27 10:57:09.055500917 +0200
-@@ -191,9 +191,17 @@
- #include <linux/string.h>
- #include <linux/gfp.h>
- #include <linux/swap.h>
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
- #include "asm/i387.h"
-+#else
-+#include <asm/fpu/api.h>
-+#endif
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
- #include <asm/fpu-internal.h>
-+#else
-+#include <asm/fpu/internal.h>
-+#endif
- #endif
-
- #include "firegl_public.h"
-@@ -1714,6 +1722,9 @@
-
- #if defined(__i386__)
- #ifndef __HAVE_ARCH_CMPXCHG
-+#ifndef __xg
-+#define __xg(x) ((volatile long *)(x))
-+#endif
- static inline
- unsigned long __fgl_cmpxchg(volatile void *ptr, unsigned long old,
- unsigned long new, int size)
-@@ -1750,7 +1761,11 @@
- unsigned long new, int size)
- {
- #ifndef __HAVE_ARCH_CMPXCHG
-+#if defined(__i386__)
- return __fgl_cmpxchg(ptr,old,new,size);
-+#elif defined(__x86_64__)
-+ return cmpxchg((unsigned long*)ptr,old,new);
-+#endif
- #else
- /* On kernel version 2.6.34 passing a variable or unsupported size
- * argument to the __cmpxchg macro causes the default-clause of a
-@@ -6446,21 +6461,36 @@
- struct fpu *fpu = &tsk->thread.fpu;
-
- if(static_cpu_has(X86_FEATURE_XSAVE)) {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
- fpu_xsave(fpu);
- if (!(fpu->state->xsave.xsave_hdr.xstate_bv & XSTATE_FP))
-+#else
-+ copy_xregs_to_kernel(&fpu->state.xsave);
-+ if (!(fpu->state.xsave.header.xfeatures & XSTATE_FP))
-+#endif
- return 1;
- } else if (static_cpu_has(X86_FEATURE_FXSR)) {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
- fpu_fxsave(fpu);
-+#else
-+ copy_fxregs_to_kernel(fpu);
-+#endif
- } else {
- asm volatile("fnsave %[fx]; fwait"
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
- : [fx] "=m" (fpu->state->fsave));
-+#else
-+ : [fx] "=m" (fpu->state.fsave));
-+#endif
- return 0;
- }
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
- if (unlikely(fpu->state->fxsave.swd & X87_FSW_ES)) {
- asm volatile("fnclex");
- return 0;
- }
-+#endif
- return 1;
- }
- #endif
-@@ -6472,8 +6502,12 @@
- void ATI_API_CALL KCL_fpu_begin(void)
- {
- #ifdef CONFIG_X86_64
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
- kernel_fpu_begin();
- #else
-+ __kernel_fpu_begin();
-+#endif
-+#else
- #ifdef TS_USEDFPU
- struct thread_info *cur_thread = current_thread_info();
- struct task_struct *cur_task = get_current();
-@@ -6518,7 +6552,11 @@
- */
- void ATI_API_CALL KCL_fpu_end(void)
- {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
- kernel_fpu_end();
-+#else
-+ __kernel_fpu_end();
-+#endif
- }
-
- /** Create new directory entry under "/proc/...."
Deleted: fglrx-driver/trunk/debian/patches/09-4.2.0-build.fpregs_active.patch
===================================================================
--- fglrx-driver/trunk/debian/patches/09-4.2.0-build.fpregs_active.patch 2016-01-22 15:26:37 UTC (rev 1582)
+++ fglrx-driver/trunk/debian/patches/09-4.2.0-build.fpregs_active.patch 2016-01-22 15:32:33 UTC (rev 1583)
@@ -1,17 +0,0 @@
-# Patch for 4.2 from Ubuntu.
-
-diff -Naur fglrx-driver-15.9.orig/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-driver-15.9/common/lib/modules/fglrx/build_mod/firegl_public.c
---- fglrx-driver-15.9.orig/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-09-27 10:58:15.146415639 +0200
-+++ fglrx-driver-15.9/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-09-27 10:58:35.682074723 +0200
-@@ -6531,7 +6531,11 @@
- /* The thread structure is changed with the commit below for kernel 3.3:
- * https://github.com/torvalds/linux/commit/7e16838d94b566a17b65231073d179bc04d590c8
- */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0)
-+ if (cur_task->thread.fpu.fpregs_active)
-+#else
- if (cur_task->thread.fpu.has_fpu)
-+#endif
- #else
- if (cur_task->thread.has_fpu)
- #endif
Deleted: fglrx-driver/trunk/debian/patches/11-4.1.0-gpl-only.patch
===================================================================
--- fglrx-driver/trunk/debian/patches/11-4.1.0-gpl-only.patch 2016-01-22 15:26:37 UTC (rev 1582)
+++ fglrx-driver/trunk/debian/patches/11-4.1.0-gpl-only.patch 2016-01-22 15:32:33 UTC (rev 1583)
@@ -1,19 +0,0 @@
-# Do not use pci_ignore_hotplug which is GPL only.
-
-diff -Naur fglrx-driver-15.9.orig/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-driver-15.9/common/lib/modules/fglrx/build_mod/firegl_public.c
---- fglrx-driver-15.9.orig/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-09-27 11:05:14.583194764 +0200
-+++ fglrx-driver-15.9/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-09-27 11:03:27.257085053 +0200
-@@ -1125,7 +1125,12 @@
- // directly here to allow suspend/resume without X server start.
- firegl_pci_save_state((KCL_PCI_DevHandle)pdev, privdev);
- pci_disable_device(pdev);
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0)
-+ if(pdev)
-+ {
-+ pdev->ignore_hotplug = 1;
-+ }
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0)
- pci_ignore_hotplug(pdev);
- #endif
- PMSG_EVENT(pdev->dev.power.power_state) = state;
Modified: fglrx-driver/trunk/debian/patches/series
===================================================================
--- fglrx-driver/trunk/debian/patches/series 2016-01-22 15:26:37 UTC (rev 1582)
+++ fglrx-driver/trunk/debian/patches/series 2016-01-22 15:32:33 UTC (rev 1583)
@@ -1,13 +1,7 @@
01-dkms-arch_compat.patch
02-authatieventsd.sh.patch
03-stub-for-agpless-kernel.patch
-04-3.17rc6-no_hotplug.patch
-05-4.0.0-build.patch
06-spelling-error-manpage.patch
-07-4.1.0-build.patch
-08-4.2.0-build.patch
-09-4.2.0-build.fpregs_active.patch
-10-4.2.0-build.copy_xregs_to_kernel.patch
-11-4.1.0-gpl-only.patch
+#10-4.2.0-build.copy_xregs_to_kernel.patch
12-4.3.0-build.patch
13-4.4.0-build.patch
Modified: fglrx-driver/trunk/debian/rules
===================================================================
--- fglrx-driver/trunk/debian/rules 2016-01-22 15:26:37 UTC (rev 1582)
+++ fglrx-driver/trunk/debian/rules 2016-01-22 15:32:33 UTC (rev 1583)
@@ -10,7 +10,6 @@
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
include debian/rules.defs
-MULTIARCH ?=
SIGNATURE_VERSION ?=
variant ?=
variant_desc_suffix ?=
@@ -30,7 +29,7 @@
cap=AMDXvBAx86.cap
endif
-libdir = usr/lib$(if $(MULTIARCH),/$(DEB_HOST_MULTIARCH))
+libdir = usr/lib/$(DEB_HOST_MULTIARCH)
sigdir = $(if $(filter $(upstream_version),$(SIGNATURE_VERSION)),debian/import,common/etc/ati)
xorg_depends = $(foreach abi, $(XORG_ABI_LIST), xorg-video-abi-$(abi) |)
@@ -188,17 +187,6 @@
############################################################################
-prepare-squeeze-backport:
- echo 8 > debian/compat
- sed -i -e '/^MULTIARCH/ s/^/#/' debian/rules.defs
- sed -i -e 's/debhelper (>= 9.*)/debhelper (>= 8.1.0~)/' \
- -e '/^Multi-Arch:/ d' debian/control
- sed -i -e '/fglrx_dri.so/ s/^/#/' debian/fglrx-driver.links.in
- debchange --bpo "Disable multiarch build."
- debchange "Reduce Build-Depends: debhelper and compat level to 8."
-
-############################################################################
-
ifneq (,$(filter VER=%,$(DEB_BUILD_OPTIONS)))
WGET ?= wget --referer www.amd.com
INSTALLER_PREFIX ?= amd-catalyst
@@ -236,6 +224,7 @@
$(packagename)_$(REAL_UPSTREAM_VERSION).orig.tar.xz: $(INSTALLER) debian/rules
rm -fr $(packagename)-$(REAL_UPSTREAM_VERSION).orig
sh $(INSTALLER) --extract $(packagename)-$(REAL_UPSTREAM_VERSION).orig
+ touch -r $$(ls -tr $$(find $(packagename)-$(REAL_UPSTREAM_VERSION).orig -type f) | grep -v etc/ati/signature | tail -n 1) newest.stamp
@set -x ; \
cd $(packagename)-$(REAL_UPSTREAM_VERSION).orig \
&& rm -f README.distro *.sh *.exp cimle-xdgsu installer_creation_policy \
@@ -246,14 +235,19 @@
&& find . -type f \( -path '*/bin/*' -o -path '*/sbin/*' -o -name '*.sh' \) -exec chmod a+x {} +
# Create the tarball.
tar -cJf $(packagename)_$(REAL_UPSTREAM_VERSION).orig.tar.xz \
+ --clamp-mtime --mtime=./newest.stamp \
+ --sort=name \
--owner=root --group=src \
$(packagename)-$(REAL_UPSTREAM_VERSION).orig
+ touch -r newest.stamp $(packagename)_$(REAL_UPSTREAM_VERSION).orig.tar.xz
# Cleanup.
rm -fr $(packagename)-$(REAL_UPSTREAM_VERSION).orig
+ rm -f newest.stamp
get-orig-source: get-orig-source-checks $(INSTALLER)
$(MAKE) -f debian/rules repack_upstream_archive
rm -f $(INSTALLER)
+ rm -rf $(filter-out ./,$(dir $(INSTALLER)))
repack_upstream_archive: $(packagename)_$(REAL_UPSTREAM_VERSION).orig.tar.xz
else
Modified: fglrx-driver/trunk/debian/rules.defs
===================================================================
--- fglrx-driver/trunk/debian/rules.defs 2016-01-22 15:26:37 UTC (rev 1582)
+++ fglrx-driver/trunk/debian/rules.defs 2016-01-22 15:32:33 UTC (rev 1583)
@@ -1,11 +1,14 @@
-MULTIARCH = yes
-SIGNATURE_VERSION = 15.9
+# if common/etc/ati/signature is empty (contains "UNSIGNED") set
+# SIGNATURE_VERSION to the current upstream version to use (an older
+# copy at) debian/import/signature instead
+SIGNATURE_VERSION = 15.12
+
XORG_ABI_LIST = 19 18 15 14 13 12 11 10 8 6.0
LINUX_KMOD_TESTED = 4.4
#INSTALLER_PREFIX = amd-driver-installer-catalyst
-INSTALLER_PREFIX.zip = amd-catalyst-omega
+INSTALLER_PREFIX.zip = radeon-crimson
+INSTALLER_SUFFIX.zip =
INSTALLER_PREFIX.run = fglrx-$(UPSTREAM_VERSION.run)/amd-driver-installer
INSTALLER_SUFFIX.run = x86.x86_64
-INSTALLER_SUFFIX.zip = linux-run-installers
More information about the Pkg-fglrx-devel
mailing list