Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-02 00:09:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore: add srt sandbox dependencies to deb and rpm (#297819)

Browse Source 
* chore: add srt sandbox dependencies to deb and rpm

* fix: move the depedency to recommends
This commit is contained in:
Robo
2026-03-30 18:29:20 +09:00
committed by GitHub
parent d96c52ea7d
commit 4927766313
4 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/gulpfile.vscode.linux.ts
View File

@@ -15,6 +15,7 @@ import packageJson from '../package.json' with { type: 'json' };
import product from '../product.json' with { type: 'json' }; import product from '../product.json' with { type: 'json' };
import { getDependencies } from './linux/dependencies-generator.ts'; import { getDependencies } from './linux/dependencies-generator.ts';
import { recommendedDeps as debianRecommendedDependencies } from './linux/debian/dep-lists.ts'; import { recommendedDeps as debianRecommendedDependencies } from './linux/debian/dep-lists.ts';
import { recommendedDeps as rpmRecommendedDependencies } from './linux/rpm/dep-lists.ts';
import * as path from 'path'; import * as path from 'path';
import * as cp from 'child_process'; import * as cp from 'child_process';
import { promisify } from 'util'; import { promisify } from 'util';
@@ -202,6 +203,7 @@ function prepareRpmPackage(arch: string) {
.pipe(replace('@@QUALITY@@', (product as typeof product & { quality?: string }).quality || '@@QUALITY@@')) .pipe(replace('@@QUALITY@@', (product as typeof product & { quality?: string }).quality || '@@QUALITY@@'))
.pipe(replace('@@UPDATEURL@@', (product as typeof product & { updateUrl?: string }).updateUrl || '@@UPDATEURL@@')) .pipe(replace('@@UPDATEURL@@', (product as typeof product & { updateUrl?: string }).updateUrl || '@@UPDATEURL@@'))
.pipe(replace('@@DEPENDENCIES@@', dependencies.join(', '))) .pipe(replace('@@DEPENDENCIES@@', dependencies.join(', ')))
.pipe(replace('@@RECOMMENDS@@', rpmRecommendedDependencies.join(', ')))
.pipe(replace('@@STRIP@@', stripBinary)) .pipe(replace('@@STRIP@@', stripBinary))
.pipe(rename('SPECS/' + product.applicationName + '.spec')); .pipe(rename('SPECS/' + product.applicationName + '.spec'));

4
build/linux/debian/dep-lists.ts
View File

@@ -17,7 +17,9 @@ export const additionalDeps = [
// Dependencies that we can only recommend // Dependencies that we can only recommend
// for now since some of the older distros don't support them. // for now since some of the older distros don't support them.
export const recommendedDeps = [ export const recommendedDeps = [
'libvulkan1' // Move to additionalDeps once support for Trusty and Jessie are dropped. 'libvulkan1', // Move to additionalDeps once support for Trusty and Jessie are dropped.
'bubblewrap', // agent command sandboxing
'socat', // agent command sandboxing
]; ];
export const referenceGeneratedDepsByArch = { export const referenceGeneratedDepsByArch = {

7
build/linux/rpm/dep-lists.ts
View File

@@ -13,7 +13,12 @@ export const additionalDeps = [
'rpmlib(FileDigests) <= 4.6.0-1', 'rpmlib(FileDigests) <= 4.6.0-1',
'libvulkan.so.1()(64bit)', 'libvulkan.so.1()(64bit)',
'libcurl.so.4()(64bit)', 'libcurl.so.4()(64bit)',
'xdg-utils' // OS integration 'xdg-utils', // OS integration
];
export const recommendedDeps = [
'bubblewrap', // agent command sandboxing
'socat', // agent command sandboxing
]; ];
export const referenceGeneratedDepsByArch = { export const referenceGeneratedDepsByArch = {

1
resources/linux/rpm/code.spec.template
View File

@@ -9,6 +9,7 @@ License: @@LICENSE@@
URL: https://code.visualstudio.com/ URL: https://code.visualstudio.com/
Icon: @@NAME@@.xpm Icon: @@NAME@@.xpm
Requires: @@DEPENDENCIES@@ Requires: @@DEPENDENCIES@@
Recommends: @@RECOMMENDS@@
AutoReq: 0 AutoReq: 0
%global __provides_exclude_from ^%{_datadir}/%{name}/.*\\.so.*$ %global __provides_exclude_from ^%{_datadir}/%{name}/.*\\.so.*$