Skip to contentSkip to conversation

mythfront-config.bb: Fix do_unpack for machines other than epia.

PATCH In review Graham Gower 3 participants 5 messages Sep 22, 2010 – Sep 24, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mythfront-config.bb: Fix do_unpack for machines other than epia.

---
 recipes/mythfront/mythfront-config.bb |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)
recipes/mythfront/mythfront-config.bb +8 -6
index b87e0be..79ba428 100644
@@ -1,11 +1,12 @@
 PV = "1.10"
-PR = "r0"
+PR = "r1"
 
 RDEPENDS_${PN} = "font-misc-misc"
 LICENSE = "MIT"
-SRC_URI = "file://tftp.sh file://xorg.conf"
+SRC_URI = "file://tftp.sh"
 
-SRC_URI_append_epia = " file://serial.sh"
+SRC_URI_append_epia = " file://serial.sh \
+			file://xorg.conf"
 
 do_install() {
 	install -d ${D}${sysconfdir}/udhcpc.d/
@@ -14,9 +15,6 @@ do_install() {
 	install -d ${D}${sysconfdir}/mythtv
 	ln -sf /var/lib/config/mysql.txt ${D}${sysconfdir}/mythtv
 
-	install -d ${D}${sysconfdir}/X11
-	install -m 0644 ${WORKDIR}/xorg.conf ${D}${sysconfdir}/X11
-
 	ln -sf /var/lib/config/lircd.conf ${D}${sysconfdir}/lircd.conf
 
 	install -d ${D}/dev
@@ -30,3 +28,7 @@ do_install() {
 	fi
 }
 
+do_install_append_epia() {
+	install -d ${D}${sysconfdir}/X11
+	install -m 0644 ${WORKDIR}/xorg.conf ${D}${sysconfdir}/X11
+}
Signature · 1 line
1.7.1
#1 lore raw

2010/9/22 Graham Gower <[email protected]>:

Quoted 5 lines

---
 recipes/mythfront/mythfront-config.bb |   14 ++++++++------

 1 files changed, 8 insertions(+), 6 deletions(-)

Thanks for unbreaking this.
I've never noticed this, but I must say I didn't really peek into this one.

Some concerns wrt the rest of the recipe though

Quoted 10 lines
recipes/mythfront/mythfront-config.bb +0 -0
index b87e0be..79ba428 100644
@@ -1,11 +1,12 @@

 PV = "1.10"

recipes/mythfront/mythfront-config.bb +1 -1
-PR = "r0"
+PR = "r1"

 RDEPENDS_${PN} = "font-misc-misc"

This is not sufficient. There should also be a dependency on mythtv itself and on lirc (but maybe mythtv will drag than one in)

Quoted 11 lines

 LICENSE = "MIT"

recipes/mythfront/mythfront-config.bb +3 -2
-SRC_URI = "file://tftp.sh file://xorg.conf"
+SRC_URI = "file://tftp.sh"
 
-SRC_URI_append_epia = " file://serial.sh"
+SRC_URI_append_epia = " file://serial.sh \
+                       file://xorg.conf"

 do_install() {
       install -d ${D}${sysconfdir}/udhcpc.d/

recipes/mythfront/mythfront-config.bb +0 -0
@@ -14,9 +15,6 @@ do_install() {
Quoted 2 lines

       install -d ${D}${sysconfdir}/mythtv
       ln -sf /var/lib/config/mysql.txt ${D}${sysconfdir}/mythtv

This is already done if you install mythtv-database

Quoted 3 lines

-       install -d ${D}${sysconfdir}/X11
-       install -m 0644 ${WORKDIR}/xorg.conf ${D}${sysconfdir}/X11

Not sure if this is good. for epia there is an xorg.conf, but it is not in the SRC_URIL for non-epia, so it cannot be installed for these (unless you get it from somewhere else)

Quoted 2 lines

-
       ln -sf /var/lib/config/lircd.conf ${D}${sysconfdir}/lircd.conf

and i would say lirc should perhaps do this.

recipes/mythfront/mythfront-config.bb do_install() {

Quoted 11 lines

       install -d ${D}/dev

recipes/mythfront/mythfront-config.bb +0 -0
@@ -30,3 +28,7 @@ do_install() {

       fi
 }

recipes/mythfront/mythfront-config.bb +4 -1
+do_install_append_epia() {
+       install -d ${D}${sysconfdir}/X11
+       install -m 0644 ${WORKDIR}/xorg.conf ${D}${sysconfdir}/X11
+}
--

Enjoy, Frans.

Acked-by
#2 lore raw

Am Freitag, den 24.09.2010, 09:24 +0200 schrieb Frans Meulenbroeks:

Quoted 41 lines

2010/9/22 Graham Gower <[email protected]>:

Quoted 5 lines
---
 recipes/mythfront/mythfront-config.bb |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

Thanks for unbreaking this.
I've never noticed this, but I must say I didn't really peek into this one.

Some concerns wrt the rest of the recipe though

recipes/mythfront/mythfront-config.bb line 4

Quoted 10 lines
recipes/mythfront/mythfront-config.bb +1 -1
index b87e0be..79ba428 100644
@@ -1,11 +1,12 @@
 PV = "1.10"
-PR = "r0"
+PR = "r1"
 
 RDEPENDS_${PN} = "font-misc-misc"

This is not sufficient. There should also be a dependency on mythtv itself and on lirc (but maybe mythtv will drag than one in)

recipes/mythfront/mythfront-config.bb do_install() { · line 16

Quoted 13 lines
recipes/mythfront/mythfront-config.bb +3 -2
 LICENSE = "MIT"
-SRC_URI = "file://tftp.sh file://xorg.conf"
+SRC_URI = "file://tftp.sh"
 
-SRC_URI_append_epia = " file://serial.sh"
+SRC_URI_append_epia = " file://serial.sh \
+                       file://xorg.conf"
 
 do_install() {
       install -d ${D}${sysconfdir}/udhcpc.d/
@@ -14,9 +15,6 @@ do_install() {
       install -d ${D}${sysconfdir}/mythtv
       ln -sf /var/lib/config/mysql.txt ${D}${sysconfdir}/mythtv

This is already done if you install mythtv-database

Quoted 1 line
Quoted 6 lines

recipes/mythfront/mythfront-config.bb do_install() { · line 18

Quoted 2 lines
recipes/mythfront/mythfront-config.bb +0 -2
-       install -d ${D}${sysconfdir}/X11
-       install -m 0644 ${WORKDIR}/xorg.conf ${D}${sysconfdir}/X11

Not sure if this is good. for epia there is an xorg.conf, but it is not in the SRC_URIL for non-epia, so it cannot be installed for these (unless you get it from somewhere else)

As far as I can see, this problem is the actual purpose of Graham’s patch. It moves these commands to do_install_append_epia().

Quoted 10 lines
Quoted 2 lines

-

       ln -sf /var/lib/config/lircd.conf ${D}${sysconfdir}/lircd.conf

and i would say lirc should perhaps do this.

Quoted 6 lines
       install -d ${D}/dev
recipes/mythfront/mythfront-config.bb +0 -0
@@ -30,3 +28,7 @@ do_install() {
       fi
 }
 
Quoted 5 lines

recipes/mythfront/mythfront-config.bb do_install() {

Quoted 5 lines
recipes/mythfront/mythfront-config.bb +4 -1
+do_install_append_epia() {
+       install -d ${D}${sysconfdir}/X11
+       install -m 0644 ${WORKDIR}/xorg.conf ${D}${sysconfdir}/X11
+}
--

Adhering to the mantra of small changes, I would acknowledge this patch and get your concerns addressed in another patch. Frans, as one of the MythTV maintainers, your Acked-by would be appreciated too, I guess.

Thanks,

Paul

#3 lore raw

2010/9/24 Paul Menzel <[email protected]>:

Quoted 6 lines

Adhering to the mantra of small changes, I would acknowledge this patch and get your concerns addressed in another patch. Frans, as one of the MythTV maintainers, your Acked-by would be appreciated too, I guess.

I have no problems with the patch, but it is already pushed, writing ack messages afterwards seem a little bit useless.

BTW: I never really bothered about mythfront; also I'm not sure if gmyth still has any significance.

Frans

#4 lore raw

Am Freitag, den 24.09.2010, 10:30 +0200 schrieb Frans Meulenbroeks:

Quoted 11 lines

2010/9/24 Paul Menzel <[email protected]>:

Quoted 6 lines

Adhering to the mantra of small changes, I would acknowledge this patch and get your concerns addressed in another patch. Frans, as one of the MythTV maintainers, your Acked-by would be appreciated too, I guess.

I have no problems with the patch, but it is already pushed, writing ack messages afterwards seem a little bit useless.

You are right. I missed that and was mislead by your comment about the issue the patch fixed.

Thanks,

Paul