[ptxdist] [PATCH] doc: document local_src clean behaviour
For local_src directories, ptxdist only calls the clean command on a full clean, not for a clean with the individual package. Document this in a note for the workflow. Signed-off-by: Rouven Czerwinski --- doc/daily_work.inc | 5 + 1 file changed, 5 insertions(+) diff --git a/doc/daily_work.inc b/doc/daily_work.inc index 47bc987e4..2636336d0 100644 --- a/doc/daily_work.inc +++ b/doc/daily_work.inc @@ -118,6 +118,11 @@ To rebuild the kernel: jbe@octopus:~/myprj$ ptxdist drop kernel compile jbe@octopus:~/myprj$ ptxdist targetinstall kernel +.. note:: To clean the kernel, change into the local_src directory and call + ``make clean`` or the clean command for the build system used by the + package. A ``ptxdist clean kernel`` call will only delete the + symlinks, but not clean the kernel compiled files. + Discovering Runtime Dependencies -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH v3 1/3] polkit: add debian patches
On Thu, Jan 17, 2019 at 10:01:29AM +, Baeuerle, Florian wrote: > Am Donnerstag, den 17.01.2019, 09:58 +0100 schrieb m.olbr...@pengutronix.de: > > On Wed, Jan 16, 2019 at 09:36:22AM +, Baeuerle, Florian wrote: > > > is there a chance to get these patches into ptxdist? I think this fixes > > > quite a > > > few bugs. > > > > > > Any rework required? > > > > I've been doing some rework myself. The situation is unlikely to change in > > the near future, so I expect we will need to import new patches again at > > some point. So I want to automate this a bit. > > I'm doing the same thing with openssl so I just copied and modified the > > script I use there (see attachment). I'm doing some build tests with this > > right now. This should hit master sometime this week. > > > > My patch selection is a bit different from yours, so I'd appreciate some > > feedback there. I'm currently importing from > > policykit-1_0.105-25.debian.tar.xz, that the latest version in Debian > > unstable. > > Okay, I see you identified more debian-specific patches. > > You blacklisted 06_systemd-service.patch, that presumably is, because the > debian > build system is responsible for installing the polkit.service file. > > I think it would be nice to install the polkit service on systemd-based > systems, > so we could either resemble what the debian build system does (i.e. placing > that > service in projectroot, and use mentioned patch) *or* use this upstream patch: > > https://cgit.freedesktop.org/polkit/commit/data/?id=29950854f6b9e9b8ea2d96d67c79eeec1046a4f1 06_systemd-service.patch is just a small part of this commit. I've rebased your patch "[PATCH v3 2/3] polkit: add patch from upstream" that adds this. The correct systemd service will be added. Michael -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH v3 1/2] host-pyhton-scons: add new package
In case you're sending v4, do a s/pyhton/python/ in the subject :) - Roland On Tue, Jan 15, 2019 at 08:17:39AM +, Denis OSTERLAND wrote: > This patch adds support for scons build system. > https://scons.org/ > > Signed-off-by: Denis Osterland > --- > rules/host-python-scons.in | 6 ++ > rules/host-python-scons.make | 35 +++ > 2 files changed, 41 insertions(+) > create mode 100644 rules/host-python-scons.in > create mode 100644 rules/host-python-scons.make > > diff --git a/rules/host-python-scons.in b/rules/host-python-scons.in > new file mode 100644 > index 0..0343fc8e1 > --- /dev/null > +++ b/rules/host-python-scons.in > @@ -0,0 +1,6 @@ > +## SECTION=hosttools_noprompt > + > +config HOST_PYTHON_SCONS > + tristate > + default y if ALLYES > + select HOST_SYSTEM_PYTHON > diff --git a/rules/host-python-scons.make b/rules/host-python-scons.make > new file mode 100644 > index 0..8fd42a41f > --- /dev/null > +++ b/rules/host-python-scons.make > @@ -0,0 +1,35 @@ > +# -*-makefile-*- > +# > +# Copyright (C) 2019 by Denis Osterland > +# > +# See CREDITS for details about who has contributed to this project. > +# > +# For further information about the PTXdist project and license conditions > +# see the README file. > +# > + > +# > +# We provide this package > +# > +HOST_PACKAGES-$(PTXCONF_HOST_PYTHON_SCONS) += host-python-scons > + > +# > +# Paths and names > +# > +HOST_PYTHON_SCONS_VERSION:= 3.0.1 > +HOST_PYTHON_SCONS_MD5:= b6a292e251b34b82c203b56cfa3968b3 > +HOST_PYTHON_SCONS:= python-scons-$(HOST_PYTHON_SCONS_VERSION) > +HOST_PYTHON_SCONS_SUFFIX := tar.gz > +HOST_PYTHON_SCONS_URL:= $(call ptx/mirror, SF, > scons/scons-$(HOST_PYTHON_SCONS_VERSION).$(HOST_PYTHON_SCONS_SUFFIX)) > +HOST_PYTHON_SCONS_SOURCE := > $(SRCDIR)/$(HOST_PYTHON_SCONS).$(HOST_PYTHON_SCONS_SUFFIX) > +HOST_PYTHON_SCONS_DIR:= $(HOST_BUILDDIR)/$(HOST_PYTHON_SCONS) > +HOST_PYTHON_SCONS_LICENSE:= MIT > +HOST_PYTHON_SCONS_LICENSE_FILES := > file://LICENSE.txt;md5=46ddf66004e5be5566367cb525a66fc6 > + > +# > > +# Prepare > +# > > + > +HOST_PYTHON_SCONS_CONF_TOOL := python > + > +# vim: syntax=make > -- > 2.20.1 > > > > Diehl Connectivity Solutions GmbH > Geschäftsführung: Horst Leonberger > Sitz der Gesellschaft: Nürnberg - Registergericht: Amtsgericht > Nürnberg: HRB 32315 > ___ > > Der Inhalt der vorstehenden E-Mail ist nicht rechtlich bindend. Diese E-Mail > enthaelt vertrauliche und/oder rechtlich geschuetzte Informationen. > Informieren Sie uns bitte, wenn Sie diese E-Mail faelschlicherweise erhalten > haben. Bitte loeschen Sie in diesem Fall die Nachricht. > Jede unerlaubte Form der Reproduktion, Bekanntgabe, Aenderung, Verteilung > und/oder Publikation dieser E-Mail ist strengstens untersagt. > The contents of the above mentioned e-mail is not legally binding. This > e-mail contains confidential and/or legally protected information. Please > inform us if you have received this e-mail by > mistake and delete it in such a case. Each unauthorized reproduction, > disclosure, alteration, distribution and/or publication of this e-mail is > strictly prohibited. > > ___ > ptxdist mailing list > ptxdist@pengutronix.de -- Roland Hieber | r.hie...@pengutronix.de | Pengutronix e.K. | https://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim | Phone: +49-5121-206917-5086 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH v3 1/2] host-pyhton-scons: add new package
Hi Michael, Am Mittwoch, den 16.01.2019, 16:35 +0100 schrieb Michael Olbrich: > On Tue, Jan 15, 2019 at 08:17:39AM +, Denis OSTERLAND wrote: > > > > This patch adds support for scons build system. > > https://scons.org/ > > > > Signed-off-by: Denis Osterland > The prefix is not correct here. It installs everything to .../local/ strange on my system it is installed correct platform-*/sysroot-host/bin/scons I will try on buster. I used rules/host-python-setuptools.make as template. Does this one gets installed correct on your system? Regards Denis > > Michael Diehl Connectivity Solutions GmbH Geschäftsführung: Horst Leonberger Sitz der Gesellschaft: Nürnberg - Registergericht: Amtsgericht Nürnberg: HRB 32315 ___ Der Inhalt der vorstehenden E-Mail ist nicht rechtlich bindend. Diese E-Mail enthaelt vertrauliche und/oder rechtlich geschuetzte Informationen. Informieren Sie uns bitte, wenn Sie diese E-Mail faelschlicherweise erhalten haben. Bitte loeschen Sie in diesem Fall die Nachricht. Jede unerlaubte Form der Reproduktion, Bekanntgabe, Aenderung, Verteilung und/oder Publikation dieser E-Mail ist strengstens untersagt. The contents of the above mentioned e-mail is not legally binding. This e-mail contains confidential and/or legally protected information. Please inform us if you have received this e-mail by mistake and delete it in such a case. Each unauthorized reproduction, disclosure, alteration, distribution and/or publication of this e-mail is strictly prohibited. ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH v3 1/3] polkit: add debian patches
Hi, Am Donnerstag, den 17.01.2019, 09:58 +0100 schrieb m.olbr...@pengutronix.de: > Hi, > > On Wed, Jan 16, 2019 at 09:36:22AM +, Baeuerle, Florian wrote: > > is there a chance to get these patches into ptxdist? I think this fixes > > quite a > > few bugs. > > > > Any rework required? > > I've been doing some rework myself. The situation is unlikely to change in > the near future, so I expect we will need to import new patches again at > some point. So I want to automate this a bit. > I'm doing the same thing with openssl so I just copied and modified the > script I use there (see attachment). I'm doing some build tests with this > right now. This should hit master sometime this week. > > My patch selection is a bit different from yours, so I'd appreciate some > feedback there. I'm currently importing from > policykit-1_0.105-25.debian.tar.xz, that the latest version in Debian > unstable. Okay, I see you identified more debian-specific patches. You blacklisted 06_systemd-service.patch, that presumably is, because the debian build system is responsible for installing the polkit.service file. I think it would be nice to install the polkit service on systemd-based systems, so we could either resemble what the debian build system does (i.e. placing that service in projectroot, and use mentioned patch) *or* use this upstream patch: https://cgit.freedesktop.org/polkit/commit/data/?id=29950854f6b9e9b8ea2d96d67c79eeec1046a4f1 - Florian ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH v3 1/3] polkit: add debian patches
Hi,
On Wed, Jan 16, 2019 at 09:36:22AM +, Baeuerle, Florian wrote:
> is there a chance to get these patches into ptxdist? I think this fixes quite
> a
> few bugs.
>
> Any rework required?
I've been doing some rework myself. The situation is unlikely to change in
the near future, so I expect we will need to import new patches again at
some point. So I want to automate this a bit.
I'm doing the same thing with openssl so I just copied and modified the
script I use there (see attachment). I'm doing some build tests with this
right now. This should hit master sometime this week.
My patch selection is a bit different from yours, so I'd appreciate some
feedback there. I'm currently importing from
policykit-1_0.105-25.debian.tar.xz, that the latest version in Debian
unstable.
Michael
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0|
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- |
#!/bin/bash
set -e
set -x
blacklist="
0.113/README-Note-to-send-security-reports-via-DBus-s-mech.patch
0.114/Add-gettext-support-for-.policy-files.patch
0.114/gettext-switch-to-default-translate-no.patch
0.116/tests-add-tests-for-high-uids.patch
01_pam_polkit.patch
02_gettext.patch
06_systemd-service.patch
"
start="$(pwd)"
src="$(pwd)/$1"
deb="$(pwd)/$2"
tmp="$(mktemp -d)"
cd "$tmp"
tar xf "$src"
policykit="$(ls -d polkit-*)"
tar xf "$deb"
patches=debian/patches
for patch in $blacklist; do
sed -i "s;\(${patch}\);#\1;" ${patches}/series
done
for dir in $(find debian/patches/ -mindepth 1 -maxdepth 1 -type d -printf
"%P\n"); do
sed -i "s;Subject:;Subject: ${dir}:;" "debian/patches/${dir}/"*
done
cd "$policykit"
git init
git add *
git commit -m "base"
git tag base
git quiltimport --patches=../$patches/ --author "Michael Olbrich
"
git filter-branch --msg-filter "cat | grep -v '^==*$' && echo '\nImported from
$(basename $deb)\n\nSigned-off-by: Michael Olbrich '"
base...master
git format-patch --no-signature -N base
mkdir "$start/$policykit"
mv 0*.patch "$start/$policykit/"
cd "$start"
rm -rf "$tmp"
cd "$start/$policykit/"
sed -i 1d 0*.patch
ls 0*.patch > series
___
ptxdist mailing list
ptxdist@pengutronix.de
