shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-11 13:27:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'sid'

Browse Source 
* Drop changes to rt patchset
* Refresh "generate pkg-config file for libbpf"
* Drop changes to drivers/firmware/google config
This commit is contained in:
Ben Hutchings
2019-05-04 23:00:55 +01:00
parent 471eb871ae f79da03296
commit 60bf994b38
39 changed files with 1644 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
debian/bin/abiupdate.py vendored
View File

@@ -13,11 +13,11 @@ from debian_linux.abi import Symbols
from debian_linux.config import ConfigCoreDump
from debian_linux.debian import Changelog, VersionLinux
default_url_base = "http://deb.debian.org/debian/"
default_url_base_incoming = "http://incoming.debian.org/debian-buildd/"
default_url_base_ports = "http://ftp.ports.debian.org/debian-ports/"
default_url_base_ports_incoming = "http://incoming.ports.debian.org/"
default_url_base_security = "http://security.debian.org/"
default_url_base = "https://deb.debian.org/debian/"
default_url_base_incoming = "https://incoming.debian.org/debian-buildd/"
default_url_base_ports = "https://deb.debian.org/debian-ports/"
default_url_base_ports_incoming = "https://incoming.ports.debian.org/"
default_url_base_security = "https://deb.debian.org/debian-security/"
class url_debian_flat(object):
@@ -54,13 +54,9 @@ class url_debian_security_pool(url_debian_pool):
class Main(object):
dir = None
def __init__(self, url, url_config=None, arch=None, featureset=None,
flavour=None):
def __init__(self, arch=None, featureset=None, flavour=None):
self.log = sys.stdout.write
self.url = self.url_config = url
if url_config is not None:
self.url_config = url_config
self.override_arch = arch
self.override_featureset = featureset
self.override_flavour = flavour
@@ -74,6 +70,12 @@ class Main(object):
self.version = changelog.version.linux_version
self.version_source = changelog.version.complete
if changelog.distribution.endswith('-security'):
self.urls = [url_base_security]
else:
self.urls = [url_base, url_base_ports,
url_base_incoming, url_base_ports_incoming]
self.config = ConfigCoreDump(fp=open("debian/config.defines.dump",
"rb"))
@@ -113,7 +115,7 @@ class Main(object):
version_abi = self.version_abi
filename = ("linux-headers-%s-%s_%s_%s.deb" %
(version_abi, prefix, self.version_source, arch))
f = self.retrieve_package(self.url, filename, arch)
f = self.retrieve_package(filename, arch)
d = self.extract_package(f, "linux-headers-%s_%s" % (prefix, arch))
f1 = d + ("/usr/src/linux-headers-%s-%s/Module.symvers" %
(version_abi, prefix))
@@ -127,18 +129,27 @@ class Main(object):
# pickle.load allows running arbitrary code.
return self.config
def retrieve_package(self, url, filename, arch):
u = url(self.source, filename, arch)
filename_out = self.dir + "/" + filename
def retrieve_package(self, filename, arch):
for i, url in enumerate(self.urls):
u = url(self.source, filename, arch)
filename_out = self.dir + "/" + filename
f_in = urlopen(u)
f_out = open(filename_out, 'wb')
while 1:
r = f_in.read()
if not r:
break
f_out.write(r)
return filename_out
try:
f_in = urlopen(u)
except HTTPError as e:
if i == len(self.urls) - 1:
# No more URLs to try
raise
else:
continue
f_out = open(filename_out, 'wb')
while 1:
r = f_in.read()
if not r:
break
f_out.write(r)
return filename_out
def save_abi(self, version_abi, symbols, arch, featureset, flavour):
dir = "debian/abi/%s" % version_abi
@@ -190,12 +201,6 @@ class Main(object):
if __name__ == '__main__':
options = optparse.OptionParser()
options.add_option("-i", "--incoming", action="store_true",
dest="incoming")
options.add_option("--incoming-config", action="store_true",
dest="incoming_config")
options.add_option("--ports", action="store_true", dest="ports")
options.add_option("--security", action="store_true", dest="security")
options.add_option("-u", "--url-base", dest="url_base",
default=default_url_base)
options.add_option("--url-base-incoming", dest="url_base_incoming",
@@ -223,15 +228,5 @@ if __name__ == '__main__':
url_base_ports = url_debian_ports_pool(opts.url_base_ports)
url_base_ports_incoming = url_debian_flat(opts.url_base_ports_incoming)
url_base_security = url_debian_security_pool(opts.url_base_security)
if opts.incoming_config:
url = url_config = url_base_incoming
else:
url_config = url_base
if opts.security:
url = url_base_security
elif opts.ports:
url = url_base_ports_incoming if opts.incoming else url_base_ports
else:
url = url_base_incoming if opts.incoming else url_base
Main(url, url_config, **kw)()
Main(**kw)()

21
debian/bin/gencontrol.py vendored
View File

@@ -38,6 +38,12 @@ class Gencontrol(Base):
'check-size': config.SchemaItemInteger(),
'check-size-with-dtb': config.SchemaItemBoolean(),
'check-uncompressed-size': config.SchemaItemInteger(),
'depends': config.SchemaItemList(','),
'provides': config.SchemaItemList(','),
'suggests': config.SchemaItemList(','),
'recommends': config.SchemaItemList(','),
'conflicts': config.SchemaItemList(','),
'breaks': config.SchemaItemList(','),
},
'relations': {
},
@@ -371,11 +377,13 @@ class Gencontrol(Base):
flavour)
config_entry_description = self.config.merge('description', arch,
featureset, flavour)
config_entry_image = self.config.merge('image', arch, featureset,
flavour)
config_entry_relations = self.config.merge('relations', arch,
featureset, flavour)
def config_entry_image(key, *args, **kwargs):
return self.config.get_merge(
'image', arch, featureset, flavour, key, *args, **kwargs)
compiler = config_entry_base.get('compiler', 'gcc')
# Work out dependency from linux-headers to compiler. Drop
@@ -403,10 +411,11 @@ class Gencontrol(Base):
image_fields = {'Description': PackageDescription()}
for field in ('Depends', 'Provides', 'Suggests', 'Recommends',
'Conflicts', 'Breaks'):
image_fields[field] = PackageRelation(config_entry_image.get(
field.lower(), None), override_arches=(arch,))
image_fields[field] = PackageRelation(
config_entry_image(field.lower(), None),
override_arches=(arch,))
generators = config_entry_image['initramfs-generators']
generators = config_entry_image('initramfs-generators')
group = PackageRelationGroup()
for i in generators:
i = config_entry_relations.get(i, i)
@@ -419,7 +428,7 @@ class Gencontrol(Base):
item.arches = [arch]
image_fields['Depends'].append(group)
bootloaders = config_entry_image.get('bootloaders')
bootloaders = config_entry_image('bootloaders', None)
if bootloaders:
group = PackageRelationGroup()
for i in bootloaders:

13
debian/bin/gencontrol_signed.py vendored
View File

@@ -291,16 +291,21 @@ linux-signed-@arch@ (@signedsourceversion@) @distribution@; urgency=@urgency@
self.image_packages:
package_dir = 'debian/%s' % image_package_name
package_files = []
package_modules = []
package_files.append({'sig_type': 'efi',
'file': 'boot/vmlinuz-%s' % image_suffix})
for root, dirs, files in os.walk('%s/lib/modules' % package_dir,
onerror=raise_func):
for name in files:
if name.endswith('.ko'):
package_files.append(
{'sig_type': 'linux-module',
'file': '%s/%s' %
(root[(len(package_dir) + 1):], name)})
package_modules.append(
'%s/%s' %
(root[(len(package_dir) + 1):], name))
package_modules.sort()
for module in package_modules:
package_files.append(
{'sig_type': 'linux-module',
'file': module })
package_certs = [get_cert_fingerprint(cert, 'sha256')
for cert in get_certs(cert_file_name)]
assert len(package_certs) >= 1

1156
debian/changelog vendored
View File

File diff suppressed because it is too large Load Diff

83
debian/config/arm64/config vendored
View File

@@ -136,6 +136,12 @@ CONFIG_IPMI_SSIF=m
CONFIG_IPMI_WATCHDOG=m
CONFIG_IPMI_POWEROFF=m
##
## file: drivers/char/tpm/Kconfig
##
CONFIG_TCG_TPM=m
CONFIG_TCG_TIS_I2C_INFINEON=m
##
## file: drivers/clk/Kconfig
##
@@ -197,6 +203,17 @@ CONFIG_CAVIUM_CPT=m
##
CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
##
## file: drivers/devfreq/Kconfig
##
CONFIG_ARM_RK3399_DMC_DEVFREQ=m
##
## file: drivers/devfreq/event/Kconfig
##
CONFIG_PM_DEVFREQ_EVENT=y
CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI=m
##
## file: drivers/dma/Kconfig
##
@@ -231,6 +248,7 @@ CONFIG_EDAC_XGENE=m
CONFIG_EXTCON=m
CONFIG_EXTCON_QCOM_SPMI_MISC=m
CONFIG_EXTCON_USB_GPIO=m
CONFIG_EXTCON_USBC_CROS_EC=m
##
## file: drivers/firmware/Kconfig
@@ -315,6 +333,7 @@ CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
##
CONFIG_DRM_ROCKCHIP=m
CONFIG_ROCKCHIP_ANALOGIX_DP=y
CONFIG_ROCKCHIP_CDN_DP=y
CONFIG_ROCKCHIP_DW_HDMI=y
CONFIG_ROCKCHIP_DW_MIPI_DSI=y
@@ -340,6 +359,11 @@ CONFIG_DRM_VC4=m
##
CONFIG_TEGRA_HOST1X=m
##
## file: drivers/hid/i2c-hid/Kconfig
##
CONFIG_I2C_HID=m
##
## file: drivers/hwmon/Kconfig
##
@@ -372,6 +396,11 @@ CONFIG_I2C_XLP9XX=m
CONFIG_I2C_CROS_EC_TUNNEL=m
CONFIG_I2C_XGENE_SLIMPRO=m
##
## file: drivers/iio/accel/Kconfig
##
CONFIG_IIO_CROS_EC_ACCEL_LEGACY=m
##
## file: drivers/iio/adc/Kconfig
##
@@ -381,16 +410,33 @@ CONFIG_QCOM_SPMI_IADC=m
CONFIG_QCOM_SPMI_VADC=m
CONFIG_ROCKCHIP_SARADC=m
##
## file: drivers/iio/common/cros_ec_sensors/Kconfig
##
CONFIG_IIO_CROS_EC_SENSORS_CORE=m
CONFIG_IIO_CROS_EC_SENSORS=m
##
## file: drivers/iio/humidity/Kconfig
##
CONFIG_DHT11=m
##
## file: drivers/iio/light/Kconfig
##
CONFIG_IIO_CROS_EC_LIGHT_PROX=m
##
## file: drivers/iio/pressure/Kconfig
##
CONFIG_IIO_CROS_EC_BARO=m
##
## file: drivers/input/keyboard/Kconfig
##
CONFIG_KEYBOARD_GPIO=m
CONFIG_KEYBOARD_TEGRA=m
CONFIG_KEYBOARD_CROS_EC=m
##
## file: drivers/input/misc/Kconfig
@@ -401,6 +447,19 @@ CONFIG_INPUT_AXP20X_PEK=m
CONFIG_INPUT_UINPUT=m
CONFIG_INPUT_HISI_POWERKEY=m
##
## file: drivers/input/mouse/Kconfig
##
CONFIG_MOUSE_ELAN_I2C=m
##
## file: drivers/input/touchscreen/Kconfig
##
CONFIG_INPUT_TOUCHSCREEN=y
CONFIG_TOUCHSCREEN_ATMEL_MXT=m
CONFIG_TOUCHSCREEN_ATMEL_MXT_T37=y
CONFIG_TOUCHSCREEN_ELAN=m
##
## file: drivers/iommu/Kconfig
##
@@ -445,6 +504,7 @@ CONFIG_TEGRA_MC=y
##
CONFIG_MFD_AXP20X_RSB=m
CONFIG_MFD_CROS_EC=y
CONFIG_MFD_CROS_EC_CHARDEV=m
CONFIG_MFD_HI655X_PMIC=m
CONFIG_MFD_MAX77620=y
CONFIG_MFD_QCOM_RPM=m
@@ -671,6 +731,12 @@ CONFIG_WCN36XX=m
##
CONFIG_BRCMFMAC_SDIO=y
##
## file: drivers/net/wireless/marvell/mwifiex/Kconfig
##
CONFIG_MWIFIEX=m
CONFIG_MWIFIEX_PCIE=m
##
## file: drivers/net/wireless/ti/Kconfig
##
@@ -802,11 +868,13 @@ CONFIG_PHY_QCOM_USB_HSIC=m
##
## file: drivers/phy/rockchip/Kconfig
##
CONFIG_PHY_ROCKCHIP_DP=m
CONFIG_PHY_ROCKCHIP_EMMC=m
CONFIG_PHY_ROCKCHIP_INNO_HDMI=m
CONFIG_PHY_ROCKCHIP_INNO_USB2=m
CONFIG_PHY_ROCKCHIP_PCIE=m
CONFIG_PHY_ROCKCHIP_TYPEC=m
CONFIG_PHY_ROCKCHIP_USB=m
##
## file: drivers/phy/tegra/Kconfig
@@ -856,18 +924,21 @@ CONFIG_POWER_RESET_SYSCON_POWEROFF=y
##
## file: drivers/power/supply/Kconfig
##
CONFIG_BATTERY_SBS=m
CONFIG_BATTERY_BQ27XXX=m
CONFIG_CHARGER_AXP20X=m
CONFIG_BATTERY_AXP20X=m
CONFIG_AXP20X_POWER=m
CONFIG_AXP288_FUEL_GAUGE=m
CONFIG_CHARGER_QCOM_SMBB=m
CONFIG_CHARGER_CROS_USBPD=m
##
## file: drivers/pwm/Kconfig
##
CONFIG_PWM=y
CONFIG_PWM_BCM2835=m
CONFIG_PWM_CROS_EC=m
CONFIG_PWM_MESON=m
CONFIG_PWM_ROCKCHIP=m
CONFIG_PWM_SUN4I=m
@@ -888,6 +959,7 @@ CONFIG_REGULATOR_QCOM_RPM=m
CONFIG_REGULATOR_QCOM_SMD_RPM=m
CONFIG_REGULATOR_QCOM_SPMI=m
CONFIG_REGULATOR_RK808=m
CONFIG_REGULATOR_VCTRL=m
##
## file: drivers/remoteproc/Kconfig
@@ -916,6 +988,7 @@ CONFIG_RTC_DRV_MAX77686=y
CONFIG_RTC_DRV_RK808=y
CONFIG_RTC_DRV_PCF8563=y
CONFIG_RTC_DRV_EFI=y
CONFIG_RTC_DRV_CROS_EC=m
CONFIG_RTC_DRV_PL031=y
CONFIG_RTC_DRV_SUN6I=y
CONFIG_RTC_DRV_MV=m
@@ -968,6 +1041,7 @@ CONFIG_SPI_ARMADA_3700=m
CONFIG_SPI_BCM2835=m
CONFIG_SPI_BCM2835AUX=m
CONFIG_SPI_MESON_SPIFC=m
CONFIG_SPI_ROCKCHIP=m
CONFIG_SPI_QUP=m
CONFIG_SPI_TEGRA114=m
CONFIG_SPI_TEGRA20_SFLASH=m
@@ -1228,6 +1302,15 @@ CONFIG_SND_I2S_HI6210_I2S=m
CONFIG_SND_SOC_QCOM=m
CONFIG_SND_SOC_APQ8016_SBC=m
##
## file: sound/soc/rockchip/Kconfig
##
CONFIG_SND_SOC_ROCKCHIP=m
CONFIG_SND_SOC_ROCKCHIP_I2S=m
CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
CONFIG_SND_SOC_ROCKCHIP_RT5645=m
CONFIG_SND_SOC_RK3399_GRU_SOUND=m
##
## file: sound/soc/sunxi/Kconfig
##

5
debian/config/armel/config.marvell vendored
View File

@@ -200,6 +200,11 @@ CONFIG_BT_HCIBPA10X=m
CONFIG_BT_HCIBFUSB=m
CONFIG_BT_HCIVHCI=m
##
## file: drivers/char/hw_random/Kconfig
##
# CONFIG_HW_RANDOM is not set
##
## file: drivers/connector/Kconfig
##

12
debian/config/armhf/config vendored
View File

@@ -781,7 +781,6 @@ CONFIG_E100=m
##
CONFIG_MV643XX_ETH=m
CONFIG_MVMDIO=m
CONFIG_MVNETA_BM_ENABLE=m
CONFIG_MVNETA=m
CONFIG_MVPP2=m
@@ -1362,6 +1361,17 @@ CONFIG_SND_SOC=m
##
CONFIG_SND_BCM2835_SOC_I2S=m
##
## file: sound/soc/codecs/Kconfig
##
CONFIG_SND_SOC_SPDIF=y
##
## file: sound/soc/davinci/Kconfig
##
CONFIG_SND_EDMA_SOC=m
CONFIG_SND_DAVINCI_SOC_MCASP=m
##
## file: sound/soc/fsl/Kconfig
##

4
debian/config/config vendored
View File

@@ -6086,9 +6086,7 @@ CONFIG_INOTIFY_USER=y
##
## file: fs/ntfs/Kconfig
##
CONFIG_NTFS_FS=m
# CONFIG_NTFS_DEBUG is not set
# CONFIG_NTFS_RW is not set
# CONFIG_NTFS_FS is not set
##
## file: fs/ocfs2/Kconfig

2
debian/config/i386/defines vendored
View File

@@ -16,7 +16,7 @@ part-long-pae: This kernel requires PAE (Physical Address Extension).
Turion or Phenom; Transmeta Efficeon; VIA C7; and some other processors.
[image]
bootloaders: grub-pc extlinux
bootloaders: grub-pc grub-efi-ia32 extlinux
install-stem: vmlinuz
breaks: xserver-xorg-input-vmmouse (<< 1:13.0.99)

2
debian/config/ia64/defines vendored
View File

@@ -8,7 +8,7 @@ kernel-arch: ia64
image-file: vmlinux.gz
[image]
bootloaders: elilo
bootloaders: grub-efi-ia64
install-stem: vmlinuz
[itanium_description]

5
debian/config/kernelarch-mips/config.mips32r6 vendored
View File

@@ -1,8 +1,3 @@
##
## file: arch/Kconfig
##
# CONFIG_JUMP_LABEL is not set
##
## file: arch/mips/Kconfig
##

5
debian/config/kernelarch-mips/config.mips64r6 vendored
View File

@@ -1,8 +1,3 @@
##
## file: arch/Kconfig
##
# CONFIG_JUMP_LABEL is not set
##
## file: arch/mips/Kconfig
##

4
debian/config/kernelarch-x86/config vendored
View File

@@ -66,7 +66,6 @@ CONFIG_CRASH_DUMP=y
# CONFIG_KEXEC_JUMP is not set
CONFIG_RELOCATABLE=y
CONFIG_RANDOMIZE_BASE=y
CONFIG_HOTPLUG_CPU=y
# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
# CONFIG_COMPAT_VDSO is not set
@@ -301,7 +300,7 @@ CONFIG_PRINTER=m
CONFIG_PPDEV=m
CONFIG_NVRAM=m
CONFIG_DTLK=m
CONFIG_R3964=m
# CONFIG_R3964 is not set
CONFIG_APPLICOM=m
CONFIG_MWAVE=m
CONFIG_RAW_DRIVER=m
@@ -1441,6 +1440,7 @@ CONFIG_INTEL_RST=m
CONFIG_INTEL_SMARTCONNECT=m
CONFIG_INTEL_PMC_IPC=m
CONFIG_SURFACE_PRO3_BUTTON=m
CONFIG_INTEL_ATOMISP2_PM=m
##
## file: drivers/pnp/Kconfig

5
debian/config/m68k/config vendored
View File

@@ -670,11 +670,6 @@ CONFIG_BINFMT_MISC=m
##
# CONFIG_JFS_FS is not set
##
## file: fs/ntfs/Kconfig
##
# CONFIG_NTFS_FS is not set
##
## file: fs/ocfs2/Kconfig
##

1
debian/config/powerpc/defines vendored
View File

@@ -11,6 +11,7 @@ vdso: true
[image]
configs:
bootloaders: grub-ieee1275
suggests: mkvmlinuz
install-stem: vmlinux

1
debian/config/ppc64/defines vendored
View File

@@ -9,6 +9,7 @@ vdso: true
[image]
configs:
bootloaders: grub-ieee1275
suggests: mkvmlinuz
install-stem: vmlinux

1
debian/config/ppc64el/defines vendored
View File

@@ -9,6 +9,7 @@ vdso: true
[image]
configs:
bootloaders: grub-ieee1275
suggests: mkvmlinuz
install-stem: vmlinux

1
debian/config/riscv64/defines vendored
View File

@@ -5,6 +5,7 @@ featuresets:
[build]
image-file: vmlinux
vdso: true
[image]
install-stem: vmlinux

7
debian/config/sparc64/defines vendored
View File

@@ -5,12 +5,13 @@ flavours:
kernel-arch: sparc
[build]
image-file: arch/sparc/boot/zImage
image-file: vmlinux
[image]
configs:
suggests: silo, fdutils
install-stem: vmlinuz
bootloaders: grub-ieee1275
suggests: fdutils
install-stem: vmlinux
[sparc64_description]
hardware: uniprocessor 64-bit UltraSPARC

1
debian/installer/modules/amd64/ntfs-modules vendored
View File

@@ -1 +0,0 @@
ntfs

1
debian/installer/modules/i386/ntfs-modules vendored
View File

@@ -1 +0,0 @@
ntfs

1
debian/installer/modules/ia64/ntfs-modules vendored
View File

@@ -1 +0,0 @@
ntfs

3
debian/installer/modules/kernel-image vendored
View File

@@ -18,3 +18,6 @@ virtio_balloon ?
virtio_mmio ?
virtio_pci ?
virtio_ring ?
# The installer generally needs good entropy sources
drivers/char/hw_random/**

1
debian/installer/modules/mips-4kc-malta/ntfs-modules vendored
View File

@@ -1 +0,0 @@
ntfs

1
debian/installer/modules/mips-octeon/ntfs-modules vendored
View File

@@ -1 +0,0 @@
ntfs

1
debian/installer/modules/mipsel-loongson-3/ntfs-modules vendored
View File

@@ -1 +0,0 @@
ntfs

6
debian/installer/package-list vendored
View File

@@ -152,12 +152,6 @@ Priority: standard
Description: JFS filesystem support
This package contains the JFS filesystem module for the kernel.
Package: ntfs-modules
Depends: kernel-image
Priority: optional
Description: NTFS filesystem support
This package contains the NTFS file system module for the kernel.
Package: ufs-modules
Depends: kernel-image
Priority: optional

1
debian/libbpf-dev.install vendored
View File

@@ -1,3 +1,4 @@
usr/include/bpf
usr/lib/*/libbpf.a
usr/lib/*/libbpf.so
usr/lib/*/pkgconfig/*

91
debian/patches/bugfix/all/libbpf-generate-pkg-config.patch vendored Normal file
View File

@@ -0,0 +1,91 @@
Author: Luca Boccassi <bluca@debian.org>
Description: generate pkg-config file for libbpf
Generate a libbpf.pc file at build time so that users can rely
on pkg-config to find the library, its CFLAGS and LDFLAGS.
Origin: https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git/commit/?id=dd399ac9e343c7573c47d6820e4a23013c54749d
Applied-Upstream: yes
--- a/tools/lib/bpf/.gitignore
+++ b/tools/lib/bpf/.gitignore
@@ -1,3 +1,4 @@
libbpf_version.h
+libbpf.pc
FEATURE-DUMP.libbpf
test_libbpf
--- a/tools/lib/bpf/Makefile
+++ b/tools/lib/bpf/Makefile
@@ -93,6 +93,7 @@ libdir_relative_SQ = $(subst ','\'',$(li
LIBBPF_VERSION=$(shell make --no-print-directory -sC ../../.. kernelversion)
LIB_FILE = libbpf.a libbpf.so.$(LIBBPF_VERSION)
+PC_FILE = libbpf.pc
OBJ = $@
N =
@@ -137,6 +138,7 @@ include $(srctree)/tools/build/Makefile.
BPF_IN := $(OUTPUT)libbpf-in.o
LIB_FILE := $(addprefix $(OUTPUT),$(LIB_FILE))
+PC_FILE := $(addprefix $(OUTPUT),$(PC_FILE))
VERSION_SCRIPT := libbpf.map
GLOBAL_SYM_COUNT = $(shell readelf -s $(BPF_IN) | \
@@ -144,7 +146,7 @@ GLOBAL_SYM_COUNT = $(shell readelf -s $(
VERSIONED_SYM_COUNT = $(shell readelf -s $(OUTPUT)libbpf.so.$(LIBBPF_VERSION) | \
grep -Eo '[^ ]+@LIBBPF_' | cut -d@ -f1 | sort -u | wc -l)
-CMD_TARGETS = $(LIB_FILE)
+CMD_TARGETS = $(LIB_FILE) $(PC_FILE)
CXX_TEST_TARGET = $(OUTPUT)test_libbpf
@@ -184,6 +186,12 @@ $(OUTPUT)libbpf.a: $(BPF_IN)
$(OUTPUT)test_libbpf: test_libbpf.cpp $(OUTPUT)libbpf.a
$(QUIET_LINK)$(CXX) $^ -lelf -o $@
+$(OUTPUT)libbpf.pc:
+ $(QUIET_GEN)sed -e "s|@PREFIX@|$(prefix)|" \
+ -e "s|@LIBDIR@|$(libdir_SQ)|" \
+ -e "s|@VERSION@|$(LIBBPF_VERSION)|" \
+ < libbpf.pc.template > $@
+
check: check_abi
check_abi: $(OUTPUT)libbpf.so.$(LIBBPF_VERSION)
@@ -214,7 +222,12 @@ install_headers:
$(call do_install,libbpf.h,$(prefix)/include/bpf,644);
$(call do_install,btf.h,$(prefix)/include/bpf,644);
-install: install_lib
+install_pkgconfig: $(PC_FILE)
+ $(call QUIET_INSTALL, $(PC_FILE)) \
+ $(call do_install,$(PC_FILE),$(libdir_SQ)/pkgconfig,644)
+
+
+install: install_lib install_pkgconfig
### Cleaning rules
@@ -224,7 +237,7 @@ config-clean:
clean:
$(call QUIET_CLEAN, libbpf) $(RM) $(TARGETS) $(CXX_TEST_TARGET) \
- *.o *~ *.a *.so .*.d .*.cmd LIBBPF-CFLAGS
+ *.o *~ *.a *.so .*.d .*.cmd *.pc LIBBPF-CFLAGS
$(call QUIET_CLEAN, core-gen) $(RM) $(OUTPUT)FEATURE-DUMP.libbpf
--- /dev/null
+++ b/tools/lib/bpf/libbpf.pc.template
@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause)
+
+prefix=@PREFIX@
+libdir=@LIBDIR@
+includedir=${prefix}/include
+
+Name: libbpf
+Description: BPF library
+Version: @VERSION@
+Libs: -L${libdir} -lbpf
+Requires.private: libelf
+Cflags: -I${includedir}

35
debian/patches/bugfix/all/revert-net-stmmac-send-tso-packets-always-from-queue.patch vendored Normal file
View File

@@ -0,0 +1,35 @@
From: Ben Hutchings <ben@decadent.org.uk>
Date: Tue, 9 Apr 2019 01:01:56 +0100
Subject: Revert "net: stmmac: Send TSO packets always from Queue 0"
Forwarded: https://lore.kernel.org/lkml/a5f9b02fbb5ca830e598f1c601cdbecc6c86b789.camel@decadent.org.uk/T/#u
This reverts commit 496eaed7fe94df7202d7cbe37873f96bcdda375e, which
was commit c5acdbee22a1b200dde07effd26fd1f649e9ab8a upstream. This
introduces data races.
---
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 886176be818e..8c3e228b1da6 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -3033,17 +3033,8 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev)
/* Manage oversized TCP frames for GMAC4 device */
if (skb_is_gso(skb) && priv->tso) {
- if (skb_shinfo(skb)->gso_type & (SKB_GSO_TCPV4 | SKB_GSO_TCPV6)) {
- /*
- * There is no way to determine the number of TSO
- * capable Queues. Let's use always the Queue 0
- * because if TSO is supported then at least this
- * one will be capable.
- */
- skb_set_queue_mapping(skb, 0);
-
+ if (skb_shinfo(skb)->gso_type & (SKB_GSO_TCPV4 | SKB_GSO_TCPV6))
return stmmac_tso_xmit(skb, dev);
- }
}
if (unlikely(stmmac_tx_avail(priv, queue) < nfrags + 1)) {

56
debian/patches/bugfix/all/xen-pciback-Don-t-disable-PCI_COMMAND-on-PCI-device-.patch vendored Normal file
View File

@@ -0,0 +1,56 @@
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Wed, 13 Feb 2019 18:21:31 -0500
Subject: xen/pciback: Don't disable PCI_COMMAND on PCI device reset.
Origin: https://git.kernel.org/linus/7681f31ec9cdacab4fd10570be924f2cef6669ba
Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2015-8553
Bug: http://xenbits.xen.org/xsa/advisory-120.html
There is no need for this at all. Worst it means that if
the guest tries to write to BARs it could lead (on certain
platforms) to PCI SERR errors.
Please note that with af6fc858a35b90e89ea7a7ee58e66628c55c776b
"xen-pciback: limit guest control of command register"
a guest is still allowed to enable those control bits (safely), but
is not allowed to disable them and that therefore a well behaved
frontend which enables things before using them will still
function correctly.
This is done via an write to the configuration register 0x4 which
triggers on the backend side:
command_write
\- pci_enable_device
\- pci_enable_device_flags
\- do_pci_enable_device
\- pcibios_enable_device
\-pci_enable_resourcess
[which enables the PCI_COMMAND_MEMORY|PCI_COMMAND_IO]
However guests (and drivers) which don't do this could cause
problems, including the security issues which XSA-120 sought
to address.
Reported-by: Jan Beulich <jbeulich@suse.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Reviewed-by: Prarit Bhargava <prarit@redhat.com>
Signed-off-by: Juergen Gross <jgross@suse.com>
---
drivers/xen/xen-pciback/pciback_ops.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/xen/xen-pciback/pciback_ops.c b/drivers/xen/xen-pciback/pciback_ops.c
index ea4a08b83fa0..787966f44589 100644
--- a/drivers/xen/xen-pciback/pciback_ops.c
+++ b/drivers/xen/xen-pciback/pciback_ops.c
@@ -127,8 +127,6 @@ void xen_pcibk_reset_device(struct pci_dev *dev)
if (pci_is_enabled(dev))
pci_disable_device(dev);
- pci_write_config_word(dev, PCI_COMMAND, 0);
-
dev->is_busmaster = 0;
} else {
pci_read_config_word(dev, PCI_COMMAND, &cmd);
--
2.11.0

52
debian/patches/bugfix/mips/MIPS-scall64-o32-Fix-indirect-syscall-number-load.patch vendored Normal file
View File

@@ -0,0 +1,52 @@
From: Aurelien Jarno <aurelien@aurel32.net>
Date: Tue, 9 Apr 2019 16:53:55 +0200
Subject: MIPS: scall64-o32: Fix indirect syscall number load
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Origin: https://git.kernel.org/linus/79b4a9cf0e2ea8203ce777c8d5cfa86c71eae86e
Commit 4c21b8fd8f14 (MIPS: seccomp: Handle indirect system calls (o32))
added indirect syscall detection for O32 processes running on MIPS64,
but it did not work correctly for big endian kernel/processes. The
reason is that the syscall number is loaded from ARG1 using the lw
instruction while this is a 64-bit value, so zero is loaded instead of
the syscall number.
Fix the code by using the ld instruction instead. When running a 32-bit
processes on a 64 bit CPU, the values are properly sign-extended, so it
ensures the value passed to syscall_trace_enter is correct.
Recent systemd versions with seccomp enabled whitelist the getpid
syscall for their internal processes (e.g. systemd-journald), but call
it through syscall(SYS_getpid). This fix therefore allows O32 big endian
systems with a 64-bit kernel to run recent systemd versions.
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Cc: <stable@vger.kernel.org> # v3.15+
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Paul Burton <paul.burton@mips.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: James Hogan <jhogan@kernel.org>
Cc: linux-mips@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
---
arch/mips/kernel/scall64-o32.S | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S
index f158c5894a9a..feb2653490df 100644
--- a/arch/mips/kernel/scall64-o32.S
+++ b/arch/mips/kernel/scall64-o32.S
@@ -125,7 +125,7 @@ trace_a_syscall:
subu t1, v0, __NR_O32_Linux
move a1, v0
bnez t1, 1f /* __NR_syscall at offset 0 */
- lw a1, PT_R4(sp) /* Arg1 for __NR_syscall case */
+ ld a1, PT_R4(sp) /* Arg1 for __NR_syscall case */
.set pop
1: jal syscall_trace_enter
--
2.20.1

29
debian/patches/bugfix/powerpc/powerpc-vdso-make-vdso32-installation-conditional-in.patch vendored Normal file
View File

@@ -0,0 +1,29 @@
From: Ben Hutchings <ben@decadent.org.uk>
Date: Fri, 22 Mar 2019 03:30:10 +0000
Subject: powerpc: vdso: Make vdso32 installation conditional in vdso_install
Bug-Debian: https://bugs.debian.org/785065
Forwarded: https://lore.kernel.org/linuxppc-dev/20190322042436.nttfgsdpdshco27y@decadent.org.uk/
The 32-bit vDSO is not needed and not normally built for 64-bit
little-endian configurations. However, the vdso_install target still
builds and installs it. Add the same config condition as is normally
used for the build.
Fixes: e0d005916994 ("powerpc/vdso: Disable building the 32-bit VDSO ...")
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
arch/powerpc/Makefile | 2 ++
1 file changed, 2 insertions(+)
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -403,7 +403,9 @@ vdso_install:
ifdef CONFIG_PPC64
$(Q)$(MAKE) $(build)=arch/$(ARCH)/kernel/vdso64 $@
endif
+ifdef CONFIG_VDSO32
$(Q)$(MAKE) $(build)=arch/$(ARCH)/kernel/vdso32 $@
+endif
archclean:
$(Q)$(MAKE) $(clean)=$(boot)

19
debian/patches/debian/ntfs-mark-it-as-broken.patch vendored Normal file
View File

@@ -0,0 +1,19 @@
From: Ben Hutchings <ben@decadent.org.uk>
Date: Thu, 25 Apr 2019 15:31:33 +0100
Subject: ntfs: mark it as broken
NTFS has unfixed issues CVE-2018-12929, CVE-2018-12930, and
CVE-2018-12931. ntfs-3g is a better supported alternative.
Make sure it can't be enabled even in custom kernels.
---
--- a/fs/ntfs/Kconfig
+++ b/fs/ntfs/Kconfig
@@ -1,5 +1,6 @@
config NTFS_FS
tristate "NTFS file system support"
+ depends on BROKEN
select NLS
help
NTFS is the file system of Microsoft Windows NT, 2000, XP and 2003.

23
debian/patches/features/all/lockdown/lockdown-refer-to-debian-wiki-until-manual-page-exists.patch vendored Normal file
View File

@@ -0,0 +1,23 @@
From: Ben Hutchings <ben@decadent.org.uk>
Date: Sun, 21 Apr 2019 00:17:13 +0100
Subject: lockdown: Refer to Debian wiki until manual page exists
Forwarded: not-needed
The lockdown denial log message currently refers to a
"kernel_lockdown.7" manual page, which is supposed to document it.
That manual page hasn't been accepted by the man-pages project and
doesn't even seem to have been submitted yet. For now, refer to the
Debian wiki.
---
--- a/security/lock_down.c
+++ b/security/lock_down.c
@@ -28,7 +28,7 @@ static void __init lock_kernel_down(cons
{
if (!kernel_locked_down) {
kernel_locked_down = true;
- pr_notice("Kernel is locked down from %s; see man kernel_lockdown.7\n",
+ pr_notice("Kernel is locked down from %s; see https://wiki.debian.org/SecureBoot\n",
where);
}
}

8
debian/patches/series vendored
View File

@@ -79,6 +79,8 @@ bugfix/powerpc/powerpc-fix-mcpu-options-for-spe-only-compiler.patch
bugfix/arm64/arm64-dts-allwinner-a64-Enable-A64-timer-workaround.patch
bugfix/powerpc/powerpc-mm-only-define-max_physmem_bits-in-sparsemem.patch
bugfix/arm64/regulator-axp20x-fix-ALDO2-DLDO2-and-ELDO3-definitio.patch
bugfix/powerpc/powerpc-vdso-make-vdso32-installation-conditional-in.patch
bugfix/mips/MIPS-scall64-o32-Fix-indirect-syscall-number-load.patch
# Arch features
features/mips/MIPS-increase-MAX-PHYSMEM-BITS-on-Loongson-3-only.patch
@@ -95,6 +97,7 @@ bugfix/all/partially-revert-usb-kconfig-using-select-for-usb_co.patch
bugfix/all/kbuild-include-addtree-remove-quotes-before-matching-path.patch
debian/revert-objtool-fix-config_stack_validation-y-warning.patch
bugfix/all/mt76-use-the-correct-hweight8-function.patch
bugfix/all/revert-net-stmmac-send-tso-packets-always-from-queue.patch
# Miscellaneous features
@@ -133,9 +136,13 @@ features/all/lockdown/0030-lockdown-Print-current-comm-in-restriction-messages.p
features/all/lockdown/enable-cold-boot-attack-mitigation.patch
features/all/lockdown/mtd-disable-slram-and-phram-when-locked-down.patch
features/all/lockdown/arm64-add-kernel-config-option-to-lock-down-when.patch
# until the "kernel_lockdown.7" manual page exists
features/all/lockdown/lockdown-refer-to-debian-wiki-until-manual-page-exists.patch
# Security fixes
debian/i386-686-pae-pci-set-pci-nobios-by-default.patch
bugfix/all/xen-pciback-Don-t-disable-PCI_COMMAND-on-PCI-device-.patch
debian/ntfs-mark-it-as-broken.patch
# Fix exported symbol versions
bugfix/all/module-disable-matching-missing-version-crc.patch
@@ -156,6 +163,7 @@ bugfix/x86/tools-x86_energy_perf_policy-fix-uninitialized-varia.patch
bugfix/x86/tools-turbostat-Add-checks-for-failure-of-fgets-and-.patch
bugfix/all/libbpf-add-soname-to-shared-object.patch
bugfix/all/libbpf-link-shared-object-with-libelf.patch
bugfix/all/libbpf-generate-pkg-config.patch
# wireless: Disable regulatory.db direct loading (until we sort out signing)
debian/wireless-disable-regulatory.db-direct-loading.patch

5
debian/rules.real vendored
View File

@@ -447,10 +447,7 @@ endif
install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_bug \
PACKAGE_DIR='$(PACKAGE_DIR)' PACKAGE_NAME='$(PACKAGE_NAME)' REAL_VERSION='$(REAL_VERSION)'
dh_strip --no-automatic-dbgsym -Xvmlinux
+$(MAKE_SELF) install-base GENCONTROL_ARGS='-Vkernel:Recommends='"$$( \
if grep -q '^CONFIG_SMP=y' $(DIR)/.config; then \
printf irqbalance,; \
fi)"
+$(MAKE_SELF) install-base
install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_dt: DT_INSTALL_DIR = $(PACKAGE_DIR)/usr/lib/linux-image-$(REAL_VERSION)
install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_dt:

2
debian/templates/control.sourcebin.in vendored
View File

@@ -4,7 +4,7 @@ Architecture: all
Section: kernel
Build-Depends: patchutils
Depends: binutils, xz-utils, ${misc:Depends}
Recommends: libc6-dev | libc-dev, gcc, make, bc, @source_basename@-config-@version@
Recommends: libc6-dev | libc-dev, gcc, make, bc, bison, flex, @source_basename@-config-@version@
Suggests: libncurses-dev | ncurses-dev, libqt4-dev, pkg-config
Multi-Arch: foreign
Description: Linux kernel source for version @version@ with Debian patches

BIN
debian/upstream/rt-signing-key.pgp vendored
View File

Binary file not shown.