Pending patches in O.S. Systems' tree
cover Pending patches in O.S. Systems' tree
Bear on mind that all those patches depends on changes not yet merged on OE-Core.
The following changes since commit 7d398784eef650c6a26b886393222f191a8c3caf:
README: fix typo (2012-03-09 07:54:41 +0100)
are available in the git repository at:
git://github.com/OSSystems/meta-oe master
https://github.com/OSSystems/meta-oe/tree/master
Otavio Salvador (3):
systemd-compat-units: rename service to run postinst scripts
connman: update to 0.79
openbox: update to 3.5.0
...connman_0.78.bbappend => connman_0.79.bbappend} | 2 +-
.../recipes-core/systemd/systemd-compat-units.bb | 8 +-
.../{opkg.service => run-postinsts.service} | 6 +-
.../openbox/openbox/fix-decorations.patch | 73 -
.../openbox/openbox/fix-dialog-buttons.patch | 38 -
.../openbox/openbox/sync-with-3.4-working.patch | 2739 --------------------
.../{openbox_3.4.11.2.bb => openbox_3.5.0.bb} | 10 +-
7 files changed, 11 insertions(+), 2865 deletions(-)
rename meta-oe/recipes-connectivity/connman/{connman_0.78.bbappend => connman_0.79.bbappend} (85%)
rename meta-oe/recipes-core/systemd/systemd-compat-units/{opkg.service => run-postinsts.service} (64%)
delete mode 100644 meta-oe/recipes-graphics/openbox/openbox/fix-decorations.patch
delete mode 100644 meta-oe/recipes-graphics/openbox/openbox/fix-dialog-buttons.patch
delete mode 100644 meta-oe/recipes-graphics/openbox/openbox/sync-with-3.4-working.patch
rename meta-oe/recipes-graphics/openbox/{openbox_3.4.11.2.bb => openbox_3.5.0.bb} (81%)Signature · 1 line
1.7.2.5
PATCH 1/3 systemd-compat-units: rename service to run postinst scripts
OE-Core uses run-postinsts script to trigger package configuration on first boot so the service ought to be named the same, for consistency.
---
.../recipes-core/systemd/systemd-compat-units.bb | 8 ++++----
.../{opkg.service => run-postinsts.service} | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
rename meta-oe/recipes-core/systemd/systemd-compat-units/{opkg.service => run-postinsts.service} (64%)meta-oe/recipes-core/systemd/systemd-compat-units.bb +4 -4
@@ -3,7 +3,7 @@ DESCRIPTION = "Units to make systemd work better with existing sysvinit scripts" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" -PR = "r14" +PR = "r15" inherit allarch
@@ -12,9 +12,9 @@ SRC_URI = "file://*.service" do_install() { install -d ${D}${base_libdir}/systemd/system/basic.target.wants install -d ${D}${base_libdir}/systemd/system/sysinit.target.wants/ - install -m 0644 ${WORKDIR}/opkg.service ${D}${base_libdir}/systemd/system - ln -sf ../opkg.service ${D}${base_libdir}/systemd/system/basic.target.wants/ - ln -sf ../opkg.service ${D}${base_libdir}/systemd/system/sysinit.target.wants/ + install -m 0644 ${WORKDIR}/run-postinsts.service ${D}${base_libdir}/systemd/system + ln -sf ../run-postinsts.service ${D}${base_libdir}/systemd/system/basic.target.wants/ + ln -sf ../run-postinsts.service ${D}${base_libdir}/systemd/system/sysinit.target.wants/ install -m 0644 ${WORKDIR}/machineid.service ${D}${base_libdir}/systemd/system ln -sf ../machineid.service ${D}${base_libdir}/systemd/system/sysinit.target.wants/
meta-oe/recipes-core/systemd/systemd-compat-units/run-postinsts.service renamed from meta-oe/recipes-core/systemd/systemd-compat-units/opkg.service +3 -3
@@ -1,12 +1,12 @@ [Unit] -Description=Opkg first boot configure +Description=Run pending postinsts DefaultDependencies=no -ConditionPathExists=|/etc/rcS.d/S98configure +ConditionPathExists=|/etc/rcS.d/S98run-postinsts After=remount-rootfs.service Before=sysinit.target [Service] -ExecStart=/etc/rcS.d/S98configure +ExecStart=/etc/rcS.d/S98run-postinsts RemainAfterExit=No Type=oneshot StandardOutput=syslog
Signature · 1 line
1.7.2.5
PATCH 2/3 connman: update to 0.79
In reply to Otavio Salvador---
...connman_0.78.bbappend => connman_0.79.bbappend} | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
rename meta-oe/recipes-connectivity/connman/{connman_0.78.bbappend => connman_0.79.bbappend} (85%)meta-oe/recipes-connectivity/connman/connman_0.79.bbappend renamed from meta-oe/recipes-connectivity/connman/connman_0.78.bbappend +1 -1
@@ -2,7 +2,7 @@ inherit systemd EXTRA_OECONF += "--with-systemdunitdir=${systemd_unitdir}/system/" -PRINC := "${@int(PRINC) + 2}" +PRINC := "${@int(PRINC) + 1}" SYSTEMD_PACKAGES = "${PN}-systemd" SYSTEMD_SERVICE_${PN}-systemd = "connman.service"
Signature · 1 line
1.7.2.5
PATCH 3/3 openbox: update to 3.5.0
In reply to Otavio Salvador---
.../openbox/openbox/fix-decorations.patch | 73 -
.../openbox/openbox/fix-dialog-buttons.patch | 38 -
.../openbox/openbox/sync-with-3.4-working.patch | 2739 --------------------
.../{openbox_3.4.11.2.bb => openbox_3.5.0.bb} | 10 +-
4 files changed, 3 insertions(+), 2857 deletions(-)
delete mode 100644 meta-oe/recipes-graphics/openbox/openbox/fix-decorations.patch
delete mode 100644 meta-oe/recipes-graphics/openbox/openbox/fix-dialog-buttons.patch
delete mode 100644 meta-oe/recipes-graphics/openbox/openbox/sync-with-3.4-working.patch
rename meta-oe/recipes-graphics/openbox/{openbox_3.4.11.2.bb => openbox_3.5.0.bb} (81%)meta-oe/recipes-graphics/openbox/openbox/fix-decorations.patch deleted +0 -73
@@ -1,73 +0,0 @@ -Fix client decorations - -Upstream-Status: Pending - -diff --git a/openbox/client.c b/openbox/client.c -index c65e350..1c82763 100644 ---- a/openbox/client.c -+++ b/openbox/client.c -@@ -1733,8 +1733,20 @@ void client_setup_decor_and_functions(ObClient *self, gboolean reconfig) - switch (self->type) { - case OB_CLIENT_TYPE_NORMAL: - /* normal windows retain all of the possible decorations and -- functionality, and can be fullscreen */ -- self->functions |= OB_CLIENT_FUNC_FULLSCREEN; -+ functionality, and can be fullscreen, unless if it can't be resized */ -+ if (self->functions & OB_CLIENT_FUNC_RESIZE) -+ self->functions |= OB_CLIENT_FUNC_FULLSCREEN; -+ else { -+ self->decorations &= ~(OB_FRAME_DECOR_HANDLE | -+ OB_FRAME_DECOR_MAXIMIZE); -+ -+ self->functions &= ~OB_CLIENT_FUNC_MAXIMIZE; -+ -+ self->mwmhints.decorations &= ~(OB_MWM_DECOR_HANDLE | -+ OB_MWM_DECOR_MAXIMIZE); -+ -+ self->mwmhints.functions &= ~OB_MWM_FUNC_MAXIMIZE; -+ } - break; - - case OB_CLIENT_TYPE_DIALOG: -diff --git a/openbox/frame.c b/openbox/frame.c -index 64dd290..fc84f2f 100644 ---- a/openbox/frame.c -+++ b/openbox/frame.c -@@ -1209,6 +1209,7 @@ static void layout_title(ObFrame *self) - firstcon = &self->rightmost; - } - -+ self->decorations = self->client->decorations; - /* stop at the end of the string (or the label, which calls break) */ - for (; *lc != '\0' && lc >= config_title_layout; lc+=i) { - if (*lc == 'L') { -@@ -1217,23 +1218,23 @@ static void layout_title(ObFrame *self) - self->label_x = x; - } - break; /* break the for loop, do other side of label */ -- } else if (*lc == 'N') { -+ } else if (*lc == 'N' && (self->decorations & OB_FRAME_DECOR_ICON)) { - if (firstcon) *firstcon = OB_FRAME_CONTEXT_ICON; - /* icon is bigger than buttons */ - place_button(self, lc, bwidth + 2, left, i, &x, &self->icon_on, &self->icon_x); -- } else if (*lc == 'D') { -+ } else if (*lc == 'D' && (self->decorations & OB_FRAME_DECOR_ALLDESKTOPS)) { - if (firstcon) *firstcon = OB_FRAME_CONTEXT_ALLDESKTOPS; - place_button(self, lc, bwidth, left, i, &x, &self->desk_on, &self->desk_x); -- } else if (*lc == 'S') { -+ } else if (*lc == 'S' && (self->decorations & OB_FRAME_DECOR_SHADE)) { - if (firstcon) *firstcon = OB_FRAME_CONTEXT_SHADE; - place_button(self, lc, bwidth, left, i, &x, &self->shade_on, &self->shade_x); -- } else if (*lc == 'I') { -+ } else if (*lc == 'I' && (self->decorations & OB_FRAME_DECOR_ICONIFY)) { - if (firstcon) *firstcon = OB_FRAME_CONTEXT_ICONIFY; - place_button(self, lc, bwidth, left, i, &x, &self->iconify_on, &self->iconify_x); -- } else if (*lc == 'M') { -+ } else if (*lc == 'M' && (self->decorations & OB_FRAME_DECOR_MAXIMIZE)) { - if (firstcon) *firstcon = OB_FRAME_CONTEXT_MAXIMIZE; - place_button(self, lc, bwidth, left, i, &x, &self->max_on, &self->max_x); -- } else if (*lc == 'C') { -+ } else if (*lc == 'C' && (self->decorations & OB_FRAME_DECOR_CLOSE)) { - if (firstcon) *firstcon = OB_FRAME_CONTEXT_CLOSE; - place_button(self, lc, bwidth, left, i, &x, &self->close_on, &self->close_x); - } else
meta-oe/recipes-graphics/openbox/openbox/fix-dialog-buttons.patch deleted +0 -38
@@ -1,38 +0,0 @@ -Fix dialog support - -Upstream-Status: Pending - -diff --git a/openbox/client.c b/openbox/client.c -index 4d54b38..c65e350 100644 ---- a/openbox/client.c -+++ b/openbox/client.c -@@ -562,6 +562,14 @@ void client_manage(Window window, ObPrompt *prompt) - /* free the ObAppSettings shallow copy */ - g_free(settings); - -+ /* force dialogs to skip taskbar */ -+ if (self->type == OB_CLIENT_TYPE_DIALOG) { -+ self->skip_taskbar = TRUE; -+ -+ gulong state = prop_atoms.net_wm_state_skip_taskbar; -+ PROP_SET32(self->window, net_wm_state, atom, state); -+ } -+ - ob_debug("Managed window 0x%lx plate 0x%x (%s)\n", - window, self->frame->window, self->class); - -@@ -1733,6 +1741,14 @@ void client_setup_decor_and_functions(ObClient *self, gboolean reconfig) - /* sometimes apps make dialog windows fullscreen for some reason (for - e.g. kpdf does this..) */ - self->functions |= OB_CLIENT_FUNC_FULLSCREEN; -+ /* these windows cannot be maximized or minimized*/ -+ self->decorations &= ~(OB_FRAME_DECOR_ICONIFY | -+ OB_FRAME_DECOR_MAXIMIZE | -+ OB_FRAME_DECOR_HANDLE); -+ -+ self->functions &= ~(OB_CLIENT_FUNC_ICONIFY | -+ OB_CLIENT_FUNC_MAXIMIZE | -+ OB_CLIENT_FUNC_RESIZE); - break; - - case OB_CLIENT_TYPE_UTILITY:
meta-oe/recipes-graphics/openbox/openbox/sync-with-3.4-working.patch deleted +0 -2739
2,739 lines not on this page · raw message
meta-oe/recipes-graphics/openbox/openbox_3.5.0.bb renamed from meta-oe/recipes-graphics/openbox/openbox_3.4.11.2.bb +3 -7
@@ -4,14 +4,10 @@ DEPENDS = "glib-2.0 pango libxml2 virtual/libx11" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -PR = "r1" +SRC_URI = "http://icculus.org/openbox/releases/openbox-${PV}.tar.gz" -SRC_URI = "http://icculus.org/openbox/releases/openbox-${PV}.tar.gz \ - file://fix-dialog-buttons.patch;patch=1 \ - file://fix-decorations.patch;patch=1" - -SRC_URI[md5sum] = "30e669134fa81df810fe7d1dc59cd931" -SRC_URI[sha256sum] = "2e7579389c30e6bb08cc721a2c1af512e049fec2670e71715aa1c4e129ec349d" +SRC_URI[md5sum] = "00441b53cf14c03566c8e82643544ff9" +SRC_URI[sha256sum] = "6fa90016530b3aa6102e254079461977439398531fb23e7ec076ff2c140fea0a" inherit autotools gettext update-alternatives
Signature · 1 line
1.7.2.5
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Op 09-03-12 17:20, Otavio Salvador schreef:
Quoted 2 lines
Bear on mind that all those patches depends on changes not yet merged on OE-Core.
As I mentioned on IRC: I'm on vacation next week, you can lean on Khem to push the patches you need to get in to match OE-core (e.g. 1 and 2).
regards,
Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (Darwin)
Comment: GPGTools - http://gpgtools.org
iEYEARECAAYFAk9abpYACgkQMkyGM64RGpG+ygCfbbefPPk+nrbXB4NyPp2bvKym jCEAoKgiBkKMkUMRP5rbjFmq/Dtzw2PG
=rJ//
-----END PGP SIGNATURE-----