* [PATCH 1/4] package_ipk: check CONFFILES exist before adding them to metadata
2013-02-15 13:09 [PATCH V2 0/4] Allow xserver-xf86-config to ship no xorg.conf Ross Burton
@ 2013-02-15 13:09 ` Ross Burton
2013-02-15 13:09 ` [PATCH 2/4] package_deb: " Ross Burton
` (3 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Ross Burton @ 2013-02-15 13:09 UTC (permalink / raw)
To: openembedded-core
opkg-build verifies that conffiles exist, so verify that the specified files
actually exist before writing them to conffiles.
This mirrors the behaviour of FILES and package_rpm's CONFFILES handling.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/classes/package_ipk.bbclass | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index d735051..e5e76ef 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -440,7 +440,8 @@ python do_package_ipk () {
bb.utils.unlockfile(lf)
raise bb.build.FuncFailed("unable to open conffiles for writing.")
for f in conffiles_str.split():
- conffiles.write('%s\n' % f)
+ if os.path.exists(oe.path.join(root, f)):
+ conffiles.write('%s\n' % f)
conffiles.close()
os.chdir(basedir)
--
1.7.10.4
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 2/4] package_deb: check CONFFILES exist before adding them to metadata
2013-02-15 13:09 [PATCH V2 0/4] Allow xserver-xf86-config to ship no xorg.conf Ross Burton
2013-02-15 13:09 ` [PATCH 1/4] package_ipk: check CONFFILES exist before adding them to metadata Ross Burton
@ 2013-02-15 13:09 ` Ross Burton
2013-02-15 13:09 ` [PATCH 3/4] xserver-xf86-config: don't ship empty xorg.conf Ross Burton
` (2 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Ross Burton @ 2013-02-15 13:09 UTC (permalink / raw)
To: openembedded-core
dpkg-deb verifies that conffiles exist, so verify that the specified files
actually exist before writing them to conffiles.
This mirrors the behaviour of FILES and package_rpm's CONFFILES handling.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/classes/package_deb.bbclass | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index 5740948..b44eb2d 100644
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -411,7 +411,8 @@ python do_package_deb () {
bb.utils.unlockfile(lf)
raise bb.build.FuncFailed("unable to open conffiles for writing.")
for f in conffiles_str.split():
- conffiles.write('%s\n' % f)
+ if os.path.exists(oe.path.join(root, f)):
+ conffiles.write('%s\n' % f)
conffiles.close()
os.chdir(basedir)
--
1.7.10.4
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 3/4] xserver-xf86-config: don't ship empty xorg.conf
2013-02-15 13:09 [PATCH V2 0/4] Allow xserver-xf86-config to ship no xorg.conf Ross Burton
2013-02-15 13:09 ` [PATCH 1/4] package_ipk: check CONFFILES exist before adding them to metadata Ross Burton
2013-02-15 13:09 ` [PATCH 2/4] package_deb: " Ross Burton
@ 2013-02-15 13:09 ` Ross Burton
2013-02-15 13:09 ` [PATCH 4/4] xserver-xf86-config: empty generic xorg.conf Ross Burton
2013-02-16 5:39 ` [PATCH V2 0/4] Allow xserver-xf86-config to ship no xorg.conf Saul Wold
4 siblings, 0 replies; 7+ messages in thread
From: Ross Burton @ 2013-02-15 13:09 UTC (permalink / raw)
To: openembedded-core
Many hardware platforms can autodetect their hardware and don't need a xorg.conf
at all. Make it easy for BSPs to not ship a xorg.conf by not installing empty
xorg.conf files.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
.../recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb
index 3c29f8b..90d6f56 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb
@@ -7,12 +7,14 @@ PR = "r11"
SRC_URI = "file://xorg.conf"
-CONFFILES_${PN} += "${sysconfdir}/X11/xorg.conf"
+CONFFILES_${PN} = "${sysconfdir}/X11/xorg.conf"
PACKAGE_ARCH = "${MACHINE_ARCH}"
+ALLOW_EMPTY_${PN} = "1"
do_install () {
- install -d ${D}/${sysconfdir}/X11
- install -m 0644 ${WORKDIR}/xorg.conf ${D}/${sysconfdir}/X11/
+ if test -s ${WORKDIR}/xorg.conf; then
+ install -d ${D}/${sysconfdir}/X11
+ install -m 0644 ${WORKDIR}/xorg.conf ${D}/${sysconfdir}/X11/
+ fi
}
-
--
1.7.10.4
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 4/4] xserver-xf86-config: empty generic xorg.conf
2013-02-15 13:09 [PATCH V2 0/4] Allow xserver-xf86-config to ship no xorg.conf Ross Burton
` (2 preceding siblings ...)
2013-02-15 13:09 ` [PATCH 3/4] xserver-xf86-config: don't ship empty xorg.conf Ross Burton
@ 2013-02-15 13:09 ` Ross Burton
2013-02-16 5:39 ` [PATCH V2 0/4] Allow xserver-xf86-config to ship no xorg.conf Saul Wold
4 siblings, 0 replies; 7+ messages in thread
From: Ross Burton @ 2013-02-15 13:09 UTC (permalink / raw)
To: openembedded-core
The idea of a generic xorg.conf is meaningless, especially when they specify the
"intel" driver. Empty this file so that unless the BSP specifies it's own
xorg.conf, no xorg.conf file is installed.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
.../xorg-xserver/xserver-xf86-config/xorg.conf | 26 --------------------
1 file changed, 26 deletions(-)
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/xorg.conf
index 9c3d490..e69de29 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/xorg.conf
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/xorg.conf
@@ -1,26 +0,0 @@
-
-Section "Device"
- Identifier "Intel Graphics Driver"
- Driver "intel"
-EndSection
-
-Section "Monitor"
- Identifier "Generic Monitor"
- Option "DPMS"
-EndSection
-
-Section "Screen"
- Identifier "Default Screen"
- Device "Intel Graphics Driver"
- Monitor "Generic Monitor"
- DefaultDepth 24
-EndSection
-
-Section "ServerLayout"
- Identifier "Default Layout"
- Screen "Default Screen"
-EndSection
-
-Section "ServerFlags"
- Option "DontZap" "0"
-EndSection
--
1.7.10.4
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH V2 0/4] Allow xserver-xf86-config to ship no xorg.conf
2013-02-15 13:09 [PATCH V2 0/4] Allow xserver-xf86-config to ship no xorg.conf Ross Burton
` (3 preceding siblings ...)
2013-02-15 13:09 ` [PATCH 4/4] xserver-xf86-config: empty generic xorg.conf Ross Burton
@ 2013-02-16 5:39 ` Saul Wold
2013-02-16 23:50 ` Richard Purdie
4 siblings, 1 reply; 7+ messages in thread
From: Saul Wold @ 2013-02-16 5:39 UTC (permalink / raw)
To: Ross Burton; +Cc: openembedded-core
On 02/15/2013 05:09 AM, Ross Burton wrote:
> Hi,
>
> Same as V1, apart from changing package_deb to have the same check on conffiles
> as package_ipk.
>
Unless I got the wrong set, this still seems to have trouble with the
hardware BSPs for routerstation and MPC machines.
Maybe you need to build those.
Thanks
Sau!
> Ross
>
> The following changes since commit 5a4ea383c3fc792cea87b834655eb013120fbb15:
>
> poky.conf: Add Ubuntu 12.04.2 to sanity tested distros (2013-02-14 23:18:00 +0000)
>
> are available in the git repository at:
>
> git://git.yoctoproject.org/poky-contrib ross/xorg
>
> for you to fetch changes up to 2ea6a8883fe2adfccd845bd94b10c5bf0b03bfe0:
>
> xserver-xf86-config: empty generic xorg.conf (2013-02-15 13:04:30 +0000)
>
> ----------------------------------------------------------------
> Ross Burton (4):
> package_ipk: check CONFFILES exist before adding them to metadata
> package_deb: check CONFFILES exist before adding them to metadata
> xserver-xf86-config: don't ship empty xorg.conf
> xserver-xf86-config: empty generic xorg.conf
>
> meta/classes/package_deb.bbclass | 3 ++-
> meta/classes/package_ipk.bbclass | 3 ++-
> .../xorg-xserver/xserver-xf86-config/xorg.conf | 26 --------------------
> .../xorg-xserver/xserver-xf86-config_0.1.bb | 10 +++++---
> 4 files changed, 10 insertions(+), 32 deletions(-)
>
> Ross Burton (4):
> package_ipk: check CONFFILES exist before adding them to metadata
> package_deb: check CONFFILES exist before adding them to metadata
> xserver-xf86-config: don't ship empty xorg.conf
> xserver-xf86-config: empty generic xorg.conf
>
> meta/classes/package_deb.bbclass | 3 ++-
> meta/classes/package_ipk.bbclass | 3 ++-
> .../xorg-xserver/xserver-xf86-config/xorg.conf | 26 --------------------
> .../xorg-xserver/xserver-xf86-config_0.1.bb | 10 +++++---
> 4 files changed, 10 insertions(+), 32 deletions(-)
>
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH V2 0/4] Allow xserver-xf86-config to ship no xorg.conf
2013-02-16 5:39 ` [PATCH V2 0/4] Allow xserver-xf86-config to ship no xorg.conf Saul Wold
@ 2013-02-16 23:50 ` Richard Purdie
0 siblings, 0 replies; 7+ messages in thread
From: Richard Purdie @ 2013-02-16 23:50 UTC (permalink / raw)
To: Saul Wold; +Cc: openembedded-core
On Fri, 2013-02-15 at 21:39 -0800, Saul Wold wrote:
> On 02/15/2013 05:09 AM, Ross Burton wrote:
> > Hi,
> >
> > Same as V1, apart from changing package_deb to have the same check on conffiles
> > as package_ipk.
> >
>
> Unless I got the wrong set, this still seems to have trouble with the
> hardware BSPs for routerstation and MPC machines.
>
> Maybe you need to build those.
I can't see the package_deb change in the branch which would explain the
failures.
Cheers,
Richard
^ permalink raw reply [flat|nested] 7+ messages in thread