Initial commit
This commit is contained in:
Your Name
+22
@@ -0,0 +1,22 @@
|
||||
From 05e059cd4e9910c00b32d377f4f98e3c8dde6bc6 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Thu, 26 Jan 2017 16:36:20 +0200
|
||||
Subject: [PATCH 4/5] Corretly install tmpfiles.d configuration
|
||||
|
||||
Upstream-Status: Inappropriate [oe-core specific]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
|
||||
---
|
||||
etc/tmpfiles.d/CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/etc/tmpfiles.d/CMakeLists.txt b/etc/tmpfiles.d/CMakeLists.txt
|
||||
index f69c773e..3eb6d0e8 100644
|
||||
--- a/etc/tmpfiles.d/CMakeLists.txt
|
||||
+++ b/etc/tmpfiles.d/CMakeLists.txt
|
||||
@@ -1 +1 @@
|
||||
-INSTALL (FILES dnf.conf DESTINATION /usr/lib/tmpfiles.d/)
|
||||
+INSTALL (FILES dnf.conf DESTINATION ${SYSCONFDIR}/tmpfiles.d/)
|
||||
--
|
||||
2.14.2
|
||||
|
||||
+27
@@ -0,0 +1,27 @@
|
||||
From ffb7942cc73c3d2c6aa7c689cdaf9bc0bcbc144b Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Thu, 26 Jan 2017 16:25:47 +0200
|
||||
Subject: [PATCH] Do not hardcode /etc and systemd unit directories
|
||||
|
||||
Upstream-Status: Inappropriate [oe-core specific]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
|
||||
---
|
||||
CMakeLists.txt | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 73552967..38cf4fbf 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -3,8 +3,8 @@ CMAKE_MINIMUM_REQUIRED (VERSION 2.4)
|
||||
|
||||
INCLUDE (${CMAKE_SOURCE_DIR}/VERSION.cmake)
|
||||
|
||||
-SET( SYSCONFDIR /etc)
|
||||
-SET( SYSTEMD_DIR /usr/lib/systemd/system)
|
||||
+SET( SYSCONFDIR ${CMAKE_INSTALL_SYSCONFDIR})
|
||||
+SET( SYSTEMD_DIR $ENV{systemd_system_unitdir})
|
||||
|
||||
IF (NOT PYTHON_DESIRED)
|
||||
FIND_PACKAGE (PythonInterp REQUIRED)
|
||||
@@ -0,0 +1,29 @@
|
||||
From 5e07c16a506b19cbb107d5e99fca41d679b23b9a Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Tue, 28 Apr 2020 15:55:00 +0200
|
||||
Subject: [PATCH] dnf: write the log lock to root
|
||||
|
||||
Writing it to /var/log appears to be racing with installation
|
||||
of base-files, and if lock is created first, base-files
|
||||
will refuse to install (due to the target directory
|
||||
already existing, and base-files creating it as a symlink).
|
||||
|
||||
Upstream-Status: Inappropriate [oe-core specific]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
---
|
||||
dnf/logging.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dnf/logging.py b/dnf/logging.py
|
||||
index bd660470..a9d808b1 100644
|
||||
--- a/dnf/logging.py
|
||||
+++ b/dnf/logging.py
|
||||
@@ -94,7 +94,7 @@ class MultiprocessRotatingFileHandler(logging.handlers.RotatingFileHandler):
|
||||
def __init__(self, filename, mode='a', maxBytes=0, backupCount=0, encoding=None, delay=False):
|
||||
super(MultiprocessRotatingFileHandler, self).__init__(
|
||||
filename, mode, maxBytes, backupCount, encoding, delay)
|
||||
- self.rotate_lock = dnf.lock.build_log_lock("/var/log/", True)
|
||||
+ self.rotate_lock = dnf.lock.build_log_lock("/", True)
|
||||
|
||||
def emit(self, record):
|
||||
while True:
|
||||
@@ -0,0 +1,24 @@
|
||||
From 7e79b3b67fd5cecd7380e7e365fd88eca63b5bfa Mon Sep 17 00:00:00 2001
|
||||
From: Jeremy Puhlman <jpuhlman@mvista.com>
|
||||
Date: Wed, 11 Mar 2020 22:10:02 +0000
|
||||
Subject: [PATCH] set python path for completion_helper
|
||||
|
||||
Upstream-Status: Inappropriate [oe-core specific]
|
||||
Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
|
||||
---
|
||||
dnf/cli/completion_helper.py.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dnf/cli/completion_helper.py.in b/dnf/cli/completion_helper.py.in
|
||||
index 351226759..2835cd3b6 100644
|
||||
--- a/dnf/cli/completion_helper.py.in
|
||||
+++ b/dnf/cli/completion_helper.py.in
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!@PYTHON_EXECUTABLE@
|
||||
+#!/usr/bin/env python3
|
||||
#
|
||||
# This file is part of dnf.
|
||||
#
|
||||
--
|
||||
2.23.0
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
From 6365389074a1b86962f3d8b22a2ead2202026a98 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Wed, 11 Jan 2017 15:10:13 +0200
|
||||
Subject: [PATCH 5/5] Do not prepend installroot to logdir.
|
||||
|
||||
This would otherwise write the logs into rootfs/var/log
|
||||
(whereas we want them in $T),
|
||||
and will break installation of base-files rpm.
|
||||
|
||||
Upstream-Status: Inappropriate [oe-core specific]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
---
|
||||
dnf/cli/cli.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dnf/cli/cli.py b/dnf/cli/cli.py
|
||||
index d2d9c082..82270ecf 100644
|
||||
--- a/dnf/cli/cli.py
|
||||
+++ b/dnf/cli/cli.py
|
||||
@@ -920,7 +920,7 @@ class Cli(object):
|
||||
logger.warning(_("Unable to detect release version (use '--releasever' to specify "
|
||||
"release version)"))
|
||||
|
||||
- for opt in ('cachedir', 'logdir', 'persistdir'):
|
||||
+ for opt in ('cachedir', 'persistdir'):
|
||||
conf.prepend_installroot(opt)
|
||||
|
||||
self.base._logging._setup_from_dnf_conf(conf)
|
||||
--
|
||||
2.14.2
|
||||
|
||||
+25
@@ -0,0 +1,25 @@
|
||||
From ceb1043c4f3de095e36908232320b74a4128a94e Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Fri, 30 Dec 2016 18:29:07 +0200
|
||||
Subject: [PATCH] Do not set PYTHON_INSTALL_DIR by running python
|
||||
|
||||
Upstream-Status: Inappropriate [oe-core specific]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 9e2e9e9e..2056089d 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -19,7 +19,7 @@ ELSE ()
|
||||
MESSAGE (FATAL_ERROR "Invalid PYTHON_DESIRED value: " ${PYTHON_DESIRED})
|
||||
ENDIF()
|
||||
|
||||
-EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from sysconfig import get_path; stdout.write(get_path('purelib'))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
|
||||
+#EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from sysconfig import get_path; stdout.write(get_path('purelib'))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
|
||||
MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}")
|
||||
|
||||
ADD_SUBDIRECTORY (dnf)
|
||||
@@ -0,0 +1,38 @@
|
||||
From 8d97b72a1d77149e2f9048d1ca6cef66da1a8aa5 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Fri, 30 Dec 2016 18:29:37 +0200
|
||||
Subject: [PATCH 2/5] Run python scripts using env
|
||||
|
||||
Otherwise the build tools hardcode the python path into them.
|
||||
|
||||
Upstream-Status: Inappropriate [oe-core specific]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
|
||||
---
|
||||
bin/dnf-automatic.in | 2 +-
|
||||
bin/dnf.in | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/bin/dnf-automatic.in b/bin/dnf-automatic.in
|
||||
index 5b06aa26..891b4c24 100755
|
||||
--- a/bin/dnf-automatic.in
|
||||
+++ b/bin/dnf-automatic.in
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!@PYTHON_EXECUTABLE@
|
||||
+#!/usr/bin/env python3
|
||||
# dnf-automatic executable.
|
||||
#
|
||||
# Copyright (C) 2014-2016 Red Hat, Inc.
|
||||
diff --git a/bin/dnf.in b/bin/dnf.in
|
||||
index 645d0f06..bdf7b3c4 100755
|
||||
--- a/bin/dnf.in
|
||||
+++ b/bin/dnf.in
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!@PYTHON_EXECUTABLE@
|
||||
+#!/usr/bin/env python3
|
||||
# The dnf executable script.
|
||||
#
|
||||
# Copyright (C) 2012-2016 Red Hat, Inc.
|
||||
--
|
||||
2.14.2
|
||||
|
||||
@@ -0,0 +1,97 @@
|
||||
SUMMARY = "Package manager forked from Yum, using libsolv as a dependency resolver"
|
||||
DESCRIPTION = "Software package manager that installs, updates, and removes \
|
||||
packages on RPM-based Linux distributions. It automatically computes \
|
||||
dependencies and determines the actions required to install packages."
|
||||
HOMEPAGE = "https://github.com/rpm-software-management/dnf"
|
||||
LICENSE = "GPL-2.0-only"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
|
||||
file://PACKAGE-LICENSING;md5=4a0548e303dbc77f067335b4d688e745 \
|
||||
"
|
||||
|
||||
SRC_URI = "git://github.com/rpm-software-management/dnf.git;branch=master;protocol=https \
|
||||
file://0001-Corretly-install-tmpfiles.d-configuration.patch \
|
||||
file://0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch \
|
||||
file://0005-Do-not-prepend-installroot-to-logdir.patch \
|
||||
file://0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \
|
||||
file://0030-Run-python-scripts-using-env.patch \
|
||||
file://0001-set-python-path-for-completion_helper.patch \
|
||||
"
|
||||
|
||||
SRC_URI:append:class-native = "file://0001-dnf-write-the-log-lock-to-root.patch"
|
||||
|
||||
SRCREV = "94b7cc7956580405b219329541d6b40db6499cf1"
|
||||
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
inherit cmake gettext bash-completion setuptools3-base systemd
|
||||
|
||||
DEPENDS += "libdnf librepo libcomps python3-iniparse"
|
||||
|
||||
# manpages generation requires http://www.sphinx-doc.org/
|
||||
EXTRA_OECMAKE = " -DWITH_MAN=0 -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DPYTHON_DESIRED=3"
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
|
||||
RDEPENDS:${PN} += " \
|
||||
python3-core \
|
||||
python3-codecs \
|
||||
python3-netclient \
|
||||
python3-email \
|
||||
python3-threading \
|
||||
python3-logging \
|
||||
python3-fcntl \
|
||||
librepo \
|
||||
python3-shell \
|
||||
libcomps \
|
||||
libdnf \
|
||||
python3-sqlite3 \
|
||||
python3-compression \
|
||||
python3-rpm \
|
||||
python3-iniparse \
|
||||
python3-json \
|
||||
python3-curses \
|
||||
python3-misc \
|
||||
python3-gpg \
|
||||
"
|
||||
|
||||
RDEPENDS:${PN}:class-native = ""
|
||||
|
||||
RRECOMMENDS:${PN}:class-target += "gnupg"
|
||||
|
||||
# Create a symlink called 'dnf' as 'make install' does not do it, but
|
||||
# .spec file in dnf source tree does (and then Fedora and dnf documentation
|
||||
# says that dnf binary is plain 'dnf').
|
||||
do_install:append() {
|
||||
ln -rs ${D}/${bindir}/dnf-3 ${D}/${bindir}/dnf
|
||||
ln -rs ${D}/${bindir}/dnf-automatic-3 ${D}/${bindir}/dnf-automatic
|
||||
}
|
||||
|
||||
# Direct dnf-native to read rpm configuration from our sysroot, not the one it was compiled in
|
||||
do_install:append:class-native() {
|
||||
create_wrapper ${D}/${bindir}/dnf \
|
||||
RPM_CONFIGDIR=${STAGING_LIBDIR_NATIVE}/rpm \
|
||||
RPM_NO_CHROOT_FOR_SCRIPTS=1
|
||||
}
|
||||
|
||||
do_install:append:class-nativesdk() {
|
||||
create_wrapper ${D}/${bindir}/dnf \
|
||||
RPM_CONFIGDIR=${SDKPATHNATIVE}${libdir_nativesdk}/rpm \
|
||||
RPM_NO_CHROOT_FOR_SCRIPTS=1
|
||||
}
|
||||
|
||||
SYSTEMD_SERVICE:${PN} = "dnf-makecache.service dnf-makecache.timer \
|
||||
dnf-automatic.service dnf-automatic.timer \
|
||||
dnf-automatic-download.service dnf-automatic-download.timer \
|
||||
dnf-automatic-install.service dnf-automatic-install.timer \
|
||||
dnf-automatic-notifyonly.service dnf-automatic-notifyonly.timer \
|
||||
"
|
||||
SYSTEMD_AUTO_ENABLE ?= "disable"
|
||||
|
||||
SKIP_RECIPE[dnf] ?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'does not build without package_rpm in PACKAGE_CLASSES due disabled rpm support in libsolv', d)}"
|
||||
|
||||
# Packages for testing purposes
|
||||
PACKAGES += "${PN}-test-main ${PN}-test-dep"
|
||||
ALLOW_EMPTY:${PN}-test-main = "1"
|
||||
ALLOW_EMPTY:${PN}-test-dep = "1"
|
||||
RRECOMMENDS:${PN}-test-main = "${PN}-test-dep"
|
||||
Reference in New Issue
Block a user