mirror of
https://git.yoctoproject.org/poky
synced 2026-02-22 09:29:40 +01:00
64857a709b
Changelog: https://metadata.ftp-master.debian.org/changelogs/main/a/apt/apt_3.0.3_changelog Dropped patches which are included in this release, or became obsolete: 0001-Fix-compilation-error-with-clang-libc-18.patch - included in this release 0001-Fix-musl-build.patch - included in this release 0001-Raise-cmake_minimum_required-to-3.13-to-avoid-warnin.patch - included in this release 0001-Remove-using-std-binary_function.patch - became obsolete, fixed upstream 0001-aptwebserver.cc-Include-array.patch - became obsolete, fixed upstream 0001-strutl-Add-missing-include-cstdint-gcc-15.patch - included in this release Added a new patch to avoid compilation error with musl: error: 'basename' was not declared in this scope; did you mean 'rename'? Adapted DEPENDS list - gnutls and gcrypt dependencies were dropped in favor of openssl in version 2.9.19. Added a new PACKAGECONFIG, 'usrmerge', which displays a gentle warning if the system isn't a usrmerge system during package installation. Added new COMMON_ARCH CMake argument - if it is not defined, CMake is trying to determine the value of this variable by running dpkg, which is usually a futile endeavour. It is used in config creation, and to print some system info. Also adapt a self test: the apt-key command has been deprecated since a while, and in this release it was completely removed. Instead sources.list file contains the signature data, on a per-repository basis. (From OE-Core rev: 1413a6144679a8347a3487f1950612ee20ff382c) Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
87 lines
3.9 KiB
Python
87 lines
3.9 KiB
Python
#
|
|
# Copyright OpenEmbedded Contributors
|
|
#
|
|
# SPDX-License-Identifier: MIT
|
|
#
|
|
|
|
import os
|
|
from oeqa.utils.httpserver import HTTPService
|
|
from oeqa.runtime.case import OERuntimeTestCase
|
|
from oeqa.core.decorator.data import skipIfNotDataVar, skipIfNotFeature
|
|
from oeqa.runtime.decorator.package import OEHasPackage
|
|
|
|
class AptTest(OERuntimeTestCase):
|
|
|
|
def pkg(self, command, expected = 0):
|
|
command = 'apt-get %s' % command
|
|
status, output = self.target.run(command, 1500)
|
|
message = os.linesep.join([command, output])
|
|
self.assertEqual(status, expected, message)
|
|
return output
|
|
|
|
class AptRepoTest(AptTest):
|
|
|
|
@classmethod
|
|
def setUpClass(cls):
|
|
service_repo = os.path.join(cls.tc.td['DEPLOY_DIR_DEB'], '')
|
|
cls.repo_server = HTTPService(service_repo,
|
|
'0.0.0.0', port=cls.tc.target.server_port,
|
|
logger=cls.tc.logger)
|
|
cls.repo_server.start()
|
|
|
|
@classmethod
|
|
def tearDownClass(cls):
|
|
cls.repo_server.stop()
|
|
|
|
def setup_source_config_for_package_install(self):
|
|
apt_get_source_server = 'http://%s:%s/' % (self.tc.target.server_ip, self.repo_server.port)
|
|
apt_get_sourceslist_dir = '/etc/apt/'
|
|
self.target.run('cd %s; echo deb [ allow-insecure=yes ] %s/all ./ > sources.list' % (apt_get_sourceslist_dir, apt_get_source_server))
|
|
|
|
def setup_source_config_for_package_install_signed(self):
|
|
apt_get_source_server = 'http://%s:%s' % (self.tc.target.server_ip, self.repo_server.port)
|
|
apt_get_sourceslist_dir = '/etc/apt/'
|
|
self.target.run("cd %s; cp sources.list sources.list.bak; sed -i 's|\[trusted=yes\] http://bogus_ip:bogus_port|%s|g' sources.list" % (apt_get_sourceslist_dir, apt_get_source_server))
|
|
|
|
def cleanup_source_config_for_package_install(self):
|
|
apt_get_sourceslist_dir = '/etc/apt/'
|
|
self.target.run('cd %s; rm sources.list' % (apt_get_sourceslist_dir))
|
|
|
|
def cleanup_source_config_for_package_install_signed(self):
|
|
apt_get_sourceslist_dir = '/etc/apt/'
|
|
self.target.run('cd %s; mv sources.list.bak sources.list' % (apt_get_sourceslist_dir))
|
|
|
|
def setup_key(self):
|
|
# the key is found on the target /etc/pki/packagefeed-gpg/
|
|
# named PACKAGEFEED-GPG-KEY-poky-branch
|
|
# copy it to /etc/apt/keyrings/PACKAGEFEED-GPG-KEY-poky-branch.asc, and
|
|
# set it as the signing key for the repos
|
|
cmd = "KEY_FILE_PATH=`realpath /etc/pki/packagefeed-gpg/P*`; "
|
|
cmd += "KEY_FILE_NAME=`basename $KEY_FILE_PATH`; "
|
|
cmd += "mkdir -p /etc/apt/keyrings; "
|
|
cmd += "cp $KEY_FILE_PATH /etc/apt/keyrings/${KEY_FILE_NAME}.asc; "
|
|
cmd += 'sed -i "s|^deb |deb \[signed-by=/etc/apt/keyrings/${KEY_FILE_NAME}.asc\] |g" /etc/apt/sources.list'
|
|
self.target.run(cmd)
|
|
|
|
@skipIfNotFeature('package-management',
|
|
'Test requires package-management to be in IMAGE_FEATURES')
|
|
@skipIfNotDataVar('IMAGE_PKGTYPE', 'deb',
|
|
'DEB is not the primary package manager')
|
|
@OEHasPackage(['apt'])
|
|
def test_apt_install_from_repo(self):
|
|
if not self.tc.td.get('PACKAGE_FEED_GPG_NAME'):
|
|
self.setup_source_config_for_package_install()
|
|
self.pkg('update')
|
|
self.pkg('remove --yes run-postinsts-dev')
|
|
self.pkg('install --yes --allow-unauthenticated run-postinsts-dev')
|
|
self.cleanup_source_config_for_package_install()
|
|
else:
|
|
# when we are here a key has been set to sign the package feed and
|
|
# public key and gnupg installed on the image by test_testimage_apt
|
|
self.setup_source_config_for_package_install_signed()
|
|
self.setup_key()
|
|
self.pkg('update')
|
|
self.pkg('install --yes run-postinsts-dev')
|
|
self.pkg('remove --yes run-postinsts-dev')
|
|
self.cleanup_source_config_for_package_install_signed()
|