Release linux (4.9.2-2).
-----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEErCspvTSmr92z9o8157/I7JWGEQkFAlh3y9sACgkQ57/I7JWG EQnjEA//SYhOSNqUHviXtGy8oEEarDM3X4Vh2WlItwM4+E0MHmwqscRA3prE9QBC HIBBYf8Ug6p3n4e/rtoW9/ACqGmcvALefTUNjV6g8fED/CoK/EOoBxx3lXAKZIYR Bf5OXoMVLSKSmDkKdR2Yxj+w3jVrYg0zUX6QAdkQ9sGNvy3e9nFy1HMzm37MuyR/ ak3phLSDr0MntJRolb2mcUrUWlt24UC+JlXmlMrEIARTGplY97/yJF7z+1r7IrFb 2GxWne7uqko5KDVeeG7rdlCobnWOKeNEmqn9P/RCy8ojL/xmcJefCuT8MNNh7Yzr 6N5XdJLg6mPbV7k6DXrvbIDI4+ti5trA//yFfrggh4KSaAFphTxRrOfExN5Nk46v sPEchu08fseG80J3KZYvlFjTbcGgB1jfNYC8E2qtEpvcEnh+QaJBKW+94KD+YoRK 5MjnpDa4FvTB1WPEPXBM/FQZc3C8i4l0jdv0ApxQNemnJaxgS+xdTZ4jxgNOHnzl vIi7UQ9mGb14/hKOWhlAs9wvHobGqgT0OjwabiY8Qa8TV4hGCXECM74kLgZcA2Zk njR+Cn5kOw8+eeVCfKCtTon9dxIdtjrL4xfGp9ga3dgwd2h9XvLswaM5lNECBtn4 dZyDx0Jdi+af10L4G9xe70bQb8KHLKgU0fpazxxvwSQe1OzFmnw= =y3x5 -----END PGP SIGNATURE----- Merge tag 'debian/4.9.2-2' Bump the changelog version for the unreleased change.
This commit is contained in:
Ben Hutchings
commit
7db3a7935f
|
|
@ -416,6 +416,7 @@ class Gencontrol(Base):
|
|||
|
||||
if build_debug:
|
||||
makeflags['DEBUG'] = True
|
||||
packages_own.extend(self.process_packages(self.templates['control.image-dbg'], vars))
|
||||
|
||||
merge_packages(packages, packages_own + packages_dummy, arch)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,18 @@
|
|||
linux (4.9.2-2) UNRELEASED; urgency=medium
|
||||
linux (4.9.2-3) UNRELEASED; urgency=medium
|
||||
|
||||
[ Roger Shimizu ]
|
||||
* [armel] Add DT support of Buffalo Linkstation Live v3 (LS-CHL)
|
||||
|
||||
-- Roger Shimizu <rogershimizu@gmail.com> Thu, 19 Jan 2017 01:06:58 +0900
|
||||
|
||||
linux (4.9.2-2) unstable; urgency=medium
|
||||
|
||||
* [sparc64] Export memcpy and memset to modules again (fixes FTBFS)
|
||||
* Revert "Remove debug symbol packages from debian/control to work around dak
|
||||
bug", which caused most binary uploads to be rejected
|
||||
|
||||
-- Ben Hutchings <ben@decadent.org.uk> Thu, 12 Jan 2017 15:52:37 +0000
|
||||
|
||||
linux (4.9.2-1) unstable; urgency=medium
|
||||
|
||||
* New upstream stable update:
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
From: Ben Hutchings <ben@decadent.org.uk>
|
||||
Date: Thu, 1 Dec 2016 23:10:49 +0000
|
||||
Date: Thu, 12 Jan 2017 00:08:36 +0000
|
||||
Subject: Revert "sparc: move exports to definitions"
|
||||
Forwarded: not-needed
|
||||
|
||||
|
|
@ -8,8 +8,11 @@ symbols exported from assembly don't automatically get modversions (ABI
|
|||
hashes).
|
||||
|
||||
Commit 70a6fcf3283a "[sparc] unify 32bit and 64bit string.h" removed
|
||||
the exports of __memmove, memcpy, memset, and memscan; don't try to
|
||||
export them again.
|
||||
the export of __memmove; don't try to export it again. It also
|
||||
completely disabled declaration of prototypes of memscan, memcpy and
|
||||
memset, which are defined as macros. gcc will still generate implicit
|
||||
calls to memcpy and memset, so restore both exports and prototypes for
|
||||
them. Don't restore the export of memscan.
|
||||
|
||||
Commit aa95ce361ed9 "sparc64: Delete __ret_efault." did what it says;
|
||||
don't try to export that symbol.
|
||||
|
|
@ -793,7 +796,7 @@ don't try to export that symbol.
|
|||
-EXPORT_SYMBOL(ip_fast_csum)
|
||||
--- /dev/null
|
||||
+++ b/arch/sparc/lib/ksyms.c
|
||||
@@ -0,0 +1,167 @@
|
||||
@@ -0,0 +1,173 @@
|
||||
+/*
|
||||
+ * Export of symbols defined in assembler
|
||||
+ */
|
||||
|
|
@ -813,11 +816,17 @@ don't try to export that symbol.
|
|||
+/* mem* functions */
|
||||
+extern void *__memscan_zero(void *, size_t);
|
||||
+extern void *__memscan_generic(void *, int, size_t);
|
||||
+#undef memcpy
|
||||
+extern void *memcpy(void *, const void *, size_t);
|
||||
+#undef memset
|
||||
+extern void *memset(void *, int, size_t);
|
||||
+extern void *__bzero(void *, size_t);
|
||||
+
|
||||
+EXPORT_SYMBOL(__memscan_zero);
|
||||
+EXPORT_SYMBOL(__memscan_generic);
|
||||
+EXPORT_SYMBOL(memcmp);
|
||||
+EXPORT_SYMBOL(memcpy);
|
||||
+EXPORT_SYMBOL(memset);
|
||||
+EXPORT_SYMBOL(memmove);
|
||||
+EXPORT_SYMBOL(__bzero);
|
||||
+
|
||||
|
|
|
|||
|
|
@ -484,26 +484,7 @@ endif
|
|||
ln -s boot/vmlinux-$(REAL_VERSION) $(DEBUG_DIR)/
|
||||
mkdir -p $(DEBUG_DIR)/lib/modules/$(REAL_VERSION)
|
||||
ln -s ../../../boot/vmlinux-$(REAL_VERSION) $(DEBUG_DIR)/lib/modules/$(REAL_VERSION)/vmlinux
|
||||
ifeq (,$(filter nodoc,$(DEB_BUILD_PROFILES)))
|
||||
dh_installdocs
|
||||
endif
|
||||
dh_installchangelogs
|
||||
dh_compress
|
||||
dh_fixperms
|
||||
dh_installdeb
|
||||
# Workaround for dak bug: any packages listed in debian/control that
|
||||
# are not installed in the main archive will always be seen as NEW.
|
||||
# So we use the same hack as debhelper: start with the control stanza
|
||||
# for the corresponding package and replace almost all fields.
|
||||
dpkg-gencontrol -p$(IMAGE_PACKAGE_NAME) -ldebian/changelog \
|
||||
-Tdebian/$(PACKAGE_NAME).substvars -Pdebian/$(PACKAGE_NAME) \
|
||||
-UPre-Depends -URecommends -USuggests -UProvides -UConflicts \
|
||||
-DPriority=extra -DAuto-Built-Package=debug-symbols \
|
||||
-DPackage=$(PACKAGE_NAME) -UDepends \
|
||||
-DDescription='Debug symbols for linux-image-$(REAL_VERSION)' \
|
||||
-DSection=debug -UMulti-Arch -UReplaces -UBreaks
|
||||
dh_md5sums
|
||||
dh_builddeb -- -Zxz
|
||||
+$(MAKE_SELF) install-base GENCONTROL_ARGS='-DAuto-Built-Package=debug-symbols'
|
||||
|
||||
install-udeb_$(ARCH): export KW_DEFCONFIG_DIR=debian/installer
|
||||
install-udeb_$(ARCH): export KW_CONFIG_DIR=debian/installer/$(ARCH)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,6 @@
|
|||
Package: linux-image-@abiname@@localversion@-dbgsym
|
||||
Build-Profiles: <!stage1>
|
||||
Depends: ${misc:Depends}
|
||||
Section: debug
|
||||
Priority: extra
|
||||
Description: Debug symbols for linux-image-@abiname@@localversion@
|
||||
Loading…
Reference in New Issue