* [RFC - WIP v2 01/10] conf-files: New recipe to create single recipe for config files
2014-06-12 5:56 [RFC - WIP v2 00/10] conf-files: New recipe to consolidate config file Saul Wold
@ 2014-06-12 5:56 ` Saul Wold
2014-06-12 13:57 ` Otavio Salvador
2014-06-12 5:56 ` [RFC - WIP v2 02/10] apmd: convert to use conf-files Saul Wold
` (9 subsequent siblings)
10 siblings, 1 reply; 18+ messages in thread
From: Saul Wold @ 2014-06-12 5:56 UTC (permalink / raw)
To: openembedded-core
This recipe will create 1 package for config files, we could optionally add
a bbclass file to ensure consistency with RRECOMMENDS_ = =conf
This is a work in progress, the do_install might even beable to automagically
generated. We don't want to create a bbclass for these since it will cause
the actual recipe/packaging to become machine specific, using this recipe will
ioslate that.
[YOCTO #4011]
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/classes/conf-files.bbclass | 3 +
meta/recipes-bsp/conf-files/conf-files_1.0.bb | 84 +++++++++++++++++++++++++++
2 files changed, 87 insertions(+)
create mode 100644 meta/classes/conf-files.bbclass
create mode 100644 meta/recipes-bsp/conf-files/conf-files_1.0.bb
diff --git a/meta/classes/conf-files.bbclass b/meta/classes/conf-files.bbclass
new file mode 100644
index 0000000..b937268
--- /dev/null
+++ b/meta/classes/conf-files.bbclass
@@ -0,0 +1,3 @@
+
+
+RRECOMMENDS_${PN} = "${PN}-conf"
diff --git a/meta/recipes-bsp/conf-files/conf-files_1.0.bb b/meta/recipes-bsp/conf-files/conf-files_1.0.bb
new file mode 100644
index 0000000..de7d893
--- /dev/null
+++ b/meta/recipes-bsp/conf-files/conf-files_1.0.bb
@@ -0,0 +1,84 @@
+SUMMARY = "Configuartion files master recipe"
+DESCRIPTION = "This package provides Configuration files for different packages that may need some kind of customization on a BSP level"
+
+LICENSE = "BSD || MIT || GPLv2"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690"
+
+SRC_URI = ""
+S = "${WORKDIR}"
+
+
+CONF_PACKAGES = " \
+ apmd \
+ alsa-state \
+ connman \
+ formfactor \
+ init-ifupdown \
+ pointercal \
+ xinput-calibrator \
+ xorg-xf86-config \
+ "
+
+# bluze4 \
+# bluez5 \
+# keymaps \
+# tslib \
+#
+
+CONF_PACKAGES[apmd] = "${datadir}/apmd/apmd_proxy.conf"
+CONF_SUMMARY[apmd] = ""
+CONF_DESCRIPTION[apmd] = ""
+CONF_PACKAGES[alsa-state] = "${sysconfdir}/asound.conf"
+CONF_PACKAGES[bluez4] = "${sysconfdir}/dbus-1/system.d/bluetooth.conf"
+CONF_PACKAGES[bluez5] = "${sysconfdir}/dbus-1/system.d/bluetooth.conf"
+CONF_PACKAGES[connman] = "${localstatedir}/lib/connman/wired.config ${libdir}/connman/wired-setup"
+CONF_PACKAGES[formfactor] = "${sysconfdir}/formfactor/machconfig"
+CONF_PACKAGES[init-ifupdown] = "${sysconfdir}/network/interfaces"
+CONF_PACKAGES[pointercal] = "${sysconfdir}/pointercal"
+CONF_PACKAGES[tslib] = "${sysconfdir}/ts.conf"
+DEBIAN_NORENAME = "1"
+
+CONF_PACKAGES[xinput-calibrator] = "${sysconfdir}/pointercal.xinput"
+RCONFLICTS_xinput-calibrator = "pointercal.xinput"
+RPROVIDES_xinput-calibrator = "pointercal.xinput"
+RREPLACES_xinput-calibrator = "pointercal.xinput"
+
+CONF_PACKAGES[xorg-xf86-config] = "${sysconfdir}/X11/xorg.conf"
+CONF_PACKAGES_NOAPPEND[xorg-xf86-config] = "1"
+
+PACKAGES = ""
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+INHIBIT_DEFAULT_DEPS = "1"
+
+python __anonymous() {
+
+ do_install_cmd = ""
+ packages = (d.getVar('CONF_PACKAGES', True) or "").split()
+ for pn in packages:
+ if not d.getVarFlag('CONF_PACKAGES_NOAPPEND', pn):
+ pn_conf = pn + "-conf"
+ else:
+ pn_conf = pn
+
+ d.appendVar('PACKAGES', pn_conf + " ")
+ d.setVar('ALLOW_EMPTY_' + pn_conf, "1")
+ d.setVar('FILES_' + pn_conf, "")
+ d.setVar('CONFFILES_' + pn_conf, "")
+ conf_paths = (d.getVarFlag('CONF_PACKAGES', pn, True) or "").split()
+ print("conf_paths: %s" % (conf_paths))
+ for conf_path in conf_paths:
+ print("conf_path: %s" % (conf_path))
+ conf_dir = os.path.dirname(conf_path)
+ conf_file = os.path.basename(conf_path)
+ d.appendVar('SRC_URI', 'file://' + conf_file + " ")
+ d.appendVar('FILES_' + pn_conf, conf_path + " ")
+ d.appendVar('CONFFILES_' + pn_conf, conf_path + " ")
+
+ # Build do_install() fragment for each config file, only if it exists
+ do_install_cmd = do_install_cmd + "if test -s ${S}/" + conf_file + "; then\n"
+ do_install_cmd = do_install_cmd + "\tinstall -d ${D}" + conf_dir + "\n"
+ do_install_cmd = do_install_cmd + "\tinstall -m 0644 ${S}/" + conf_file + " ${D}" + conf_dir + "\n"
+ do_install_cmd = do_install_cmd + "fi\n"
+
+ d.setVar('do_install', do_install_cmd)
+}
--
1.8.3.2
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [RFC - WIP v2 01/10] conf-files: New recipe to create single recipe for config files
2014-06-12 5:56 ` [RFC - WIP v2 01/10] conf-files: New recipe to create single recipe for config files Saul Wold
@ 2014-06-12 13:57 ` Otavio Salvador
2014-06-13 8:06 ` Richard Purdie
0 siblings, 1 reply; 18+ messages in thread
From: Otavio Salvador @ 2014-06-12 13:57 UTC (permalink / raw)
To: Saul Wold; +Cc: Patches and discussions about the oe-core layer
On Thu, Jun 12, 2014 at 2:56 AM, Saul Wold <sgw@linux.intel.com> wrote:
> This recipe will create 1 package for config files, we could optionally add
> a bbclass file to ensure consistency with RRECOMMENDS_ = =conf
>
> This is a work in progress, the do_install might even beable to automagically
> generated. We don't want to create a bbclass for these since it will cause
> the actual recipe/packaging to become machine specific, using this recipe will
> ioslate that.
>
> [YOCTO #4011]
>
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
I think the configuration file, nowadays, already made those machine
specific in every BSP which has those overriden so I don't see why use
a single recipe to provide several configuration files.
I think it will be confusing and this recipe will fast grow.
--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [RFC - WIP v2 01/10] conf-files: New recipe to create single recipe for config files
2014-06-12 13:57 ` Otavio Salvador
@ 2014-06-13 8:06 ` Richard Purdie
2014-06-13 15:30 ` Otavio Salvador
0 siblings, 1 reply; 18+ messages in thread
From: Richard Purdie @ 2014-06-13 8:06 UTC (permalink / raw)
To: Otavio Salvador; +Cc: Patches and discussions about the oe-core layer
On Thu, 2014-06-12 at 10:57 -0300, Otavio Salvador wrote:
> On Thu, Jun 12, 2014 at 2:56 AM, Saul Wold <sgw@linux.intel.com> wrote:
> > This recipe will create 1 package for config files, we could optionally add
> > a bbclass file to ensure consistency with RRECOMMENDS_ = =conf
> >
> > This is a work in progress, the do_install might even beable to automagically
> > generated. We don't want to create a bbclass for these since it will cause
> > the actual recipe/packaging to become machine specific, using this recipe will
> > ioslate that.
> >
> > [YOCTO #4011]
> >
> > Signed-off-by: Saul Wold <sgw@linux.intel.com>
>
> I think the configuration file, nowadays, already made those machine
> specific in every BSP which has those overriden so I don't see why use
> a single recipe to provide several configuration files.
>
> I think it will be confusing and this recipe will fast grow.
There are a few good reasons to do this.
Machine customisation is spread around a whole load of different recipes
at the moment and its hard to obtain a good view of what files are
available and which ones a BSP author may need to provide.
Its rather ugly to have to provide and maintain multiple bbappend files
with rather ugly syntax within them. Its also rather inefficient from a
build process standpoint to have 15-20 recipes just packaging
configuration files.
The intent isn't to mandate *every* config file should be in this
recipe, you will as now be able to add additional ones. Where we see the
same files being added in many layers, adding something common and
shared makes sense though.
It should in some cases also allow the "core" recipe to stop being
machine specific and shared, improving build efficiency. There is little
point in a recipe becomming machine specific over a config file.
So I'd consider this move a consolation which we can improve over time.
For new users I'd suggest that one more common place for the majority of
machine specific files would be more understandable too.
Cheers,
Richard
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [RFC - WIP v2 01/10] conf-files: New recipe to create single recipe for config files
2014-06-13 8:06 ` Richard Purdie
@ 2014-06-13 15:30 ` Otavio Salvador
2014-06-13 15:40 ` Richard Purdie
0 siblings, 1 reply; 18+ messages in thread
From: Otavio Salvador @ 2014-06-13 15:30 UTC (permalink / raw)
To: Richard Purdie; +Cc: Patches and discussions about the oe-core layer
On Fri, Jun 13, 2014 at 5:06 AM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> On Thu, 2014-06-12 at 10:57 -0300, Otavio Salvador wrote:
>> On Thu, Jun 12, 2014 at 2:56 AM, Saul Wold <sgw@linux.intel.com> wrote:
>> > This recipe will create 1 package for config files, we could optionally add
>> > a bbclass file to ensure consistency with RRECOMMENDS_ = =conf
>> >
>> > This is a work in progress, the do_install might even beable to automagically
>> > generated. We don't want to create a bbclass for these since it will cause
>> > the actual recipe/packaging to become machine specific, using this recipe will
>> > ioslate that.
>> >
>> > [YOCTO #4011]
>> >
>> > Signed-off-by: Saul Wold <sgw@linux.intel.com>
>>
>> I think the configuration file, nowadays, already made those machine
>> specific in every BSP which has those overriden so I don't see why use
>> a single recipe to provide several configuration files.
>>
>> I think it will be confusing and this recipe will fast grow.
>
> There are a few good reasons to do this.
>
> Machine customisation is spread around a whole load of different recipes
> at the moment and its hard to obtain a good view of what files are
> available and which ones a BSP author may need to provide.
>
> Its rather ugly to have to provide and maintain multiple bbappend files
> with rather ugly syntax within them. Its also rather inefficient from a
> build process standpoint to have 15-20 recipes just packaging
> configuration files.
>
> The intent isn't to mandate *every* config file should be in this
> recipe, you will as now be able to add additional ones. Where we see the
> same files being added in many layers, adding something common and
> shared makes sense though.
>
> It should in some cases also allow the "core" recipe to stop being
> machine specific and shared, improving build efficiency. There is little
> point in a recipe becomming machine specific over a config file.
>
> So I'd consider this move a consolation which we can improve over time.
> For new users I'd suggest that one more common place for the majority of
> machine specific files would be more understandable too.
I understand and mostly agree. However I don't want to have a recipe
with 20 configuration files where I'd need just two.
So I think we'd need to have a way to 'enable/disable' each
configuration override. Does it makes sense?
--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [RFC - WIP v2 01/10] conf-files: New recipe to create single recipe for config files
2014-06-13 15:30 ` Otavio Salvador
@ 2014-06-13 15:40 ` Richard Purdie
2014-06-13 16:10 ` Mark Hatle
0 siblings, 1 reply; 18+ messages in thread
From: Richard Purdie @ 2014-06-13 15:40 UTC (permalink / raw)
To: Otavio Salvador; +Cc: Patches and discussions about the oe-core layer
On Fri, 2014-06-13 at 12:30 -0300, Otavio Salvador wrote:
> On Fri, Jun 13, 2014 at 5:06 AM, Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
> > On Thu, 2014-06-12 at 10:57 -0300, Otavio Salvador wrote:
> >> On Thu, Jun 12, 2014 at 2:56 AM, Saul Wold <sgw@linux.intel.com> wrote:
> >> > This recipe will create 1 package for config files, we could optionally add
> >> > a bbclass file to ensure consistency with RRECOMMENDS_ = =conf
> >> >
> >> > This is a work in progress, the do_install might even beable to automagically
> >> > generated. We don't want to create a bbclass for these since it will cause
> >> > the actual recipe/packaging to become machine specific, using this recipe will
> >> > ioslate that.
> >> >
> >> > [YOCTO #4011]
> >> >
> >> > Signed-off-by: Saul Wold <sgw@linux.intel.com>
> >>
> >> I think the configuration file, nowadays, already made those machine
> >> specific in every BSP which has those overriden so I don't see why use
> >> a single recipe to provide several configuration files.
> >>
> >> I think it will be confusing and this recipe will fast grow.
> >
> > There are a few good reasons to do this.
> >
> > Machine customisation is spread around a whole load of different recipes
> > at the moment and its hard to obtain a good view of what files are
> > available and which ones a BSP author may need to provide.
> >
> > Its rather ugly to have to provide and maintain multiple bbappend files
> > with rather ugly syntax within them. Its also rather inefficient from a
> > build process standpoint to have 15-20 recipes just packaging
> > configuration files.
> >
> > The intent isn't to mandate *every* config file should be in this
> > recipe, you will as now be able to add additional ones. Where we see the
> > same files being added in many layers, adding something common and
> > shared makes sense though.
> >
> > It should in some cases also allow the "core" recipe to stop being
> > machine specific and shared, improving build efficiency. There is little
> > point in a recipe becomming machine specific over a config file.
> >
> > So I'd consider this move a consolation which we can improve over time.
> > For new users I'd suggest that one more common place for the majority of
> > machine specific files would be more understandable too.
>
> I understand and mostly agree. However I don't want to have a recipe
> with 20 configuration files where I'd need just two.
>
> So I think we'd need to have a way to 'enable/disable' each
> configuration override. Does it makes sense?
I'd have thought our standard inheritance would apply so that if you
didn't append a machine specific version, the default would be used?
Cheers,
Richard
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [RFC - WIP v2 01/10] conf-files: New recipe to create single recipe for config files
2014-06-13 15:40 ` Richard Purdie
@ 2014-06-13 16:10 ` Mark Hatle
0 siblings, 0 replies; 18+ messages in thread
From: Mark Hatle @ 2014-06-13 16:10 UTC (permalink / raw)
To: openembedded-core
On 6/13/14, 10:40 AM, Richard Purdie wrote:
> On Fri, 2014-06-13 at 12:30 -0300, Otavio Salvador wrote:
>> On Fri, Jun 13, 2014 at 5:06 AM, Richard Purdie
>> <richard.purdie@linuxfoundation.org> wrote:
>>> On Thu, 2014-06-12 at 10:57 -0300, Otavio Salvador wrote:
>>>> On Thu, Jun 12, 2014 at 2:56 AM, Saul Wold <sgw@linux.intel.com> wrote:
>>>>> This recipe will create 1 package for config files, we could optionally add
>>>>> a bbclass file to ensure consistency with RRECOMMENDS_ = =conf
>>>>>
>>>>> This is a work in progress, the do_install might even beable to automagically
>>>>> generated. We don't want to create a bbclass for these since it will cause
>>>>> the actual recipe/packaging to become machine specific, using this recipe will
>>>>> ioslate that.
>>>>>
>>>>> [YOCTO #4011]
>>>>>
>>>>> Signed-off-by: Saul Wold <sgw@linux.intel.com>
>>>>
>>>> I think the configuration file, nowadays, already made those machine
>>>> specific in every BSP which has those overriden so I don't see why use
>>>> a single recipe to provide several configuration files.
>>>>
>>>> I think it will be confusing and this recipe will fast grow.
>>>
>>> There are a few good reasons to do this.
>>>
>>> Machine customisation is spread around a whole load of different recipes
>>> at the moment and its hard to obtain a good view of what files are
>>> available and which ones a BSP author may need to provide.
>>>
>>> Its rather ugly to have to provide and maintain multiple bbappend files
>>> with rather ugly syntax within them. Its also rather inefficient from a
>>> build process standpoint to have 15-20 recipes just packaging
>>> configuration files.
>>>
>>> The intent isn't to mandate *every* config file should be in this
>>> recipe, you will as now be able to add additional ones. Where we see the
>>> same files being added in many layers, adding something common and
>>> shared makes sense though.
>>>
>>> It should in some cases also allow the "core" recipe to stop being
>>> machine specific and shared, improving build efficiency. There is little
>>> point in a recipe becomming machine specific over a config file.
>>>
>>> So I'd consider this move a consolation which we can improve over time.
>>> For new users I'd suggest that one more common place for the majority of
>>> machine specific files would be more understandable too.
>>
>> I understand and mostly agree. However I don't want to have a recipe
>> with 20 configuration files where I'd need just two.
>>
>> So I think we'd need to have a way to 'enable/disable' each
>> configuration override. Does it makes sense?
>
> I'd have thought our standard inheritance would apply so that if you
> didn't append a machine specific version, the default would be used?
That was my expectation as well. We know a certain set of things -could-, and
are commonly configured by a BSP. So we have a configuration 'recipe' that can
use either the default file (provided by the non-machine specific version), or
the machine specific configuration as a replacement due to the package
management system(s).
The inheritance mechanism should work that if you add a configuration it is
enabled, otherwise it's not and the default version is used instead. (That's
what I thought the anonymous python is doing within the 1/10 patch.)
--Mark
> Cheers,
>
> Richard
>
>
^ permalink raw reply [flat|nested] 18+ messages in thread
* [RFC - WIP v2 02/10] apmd: convert to use conf-files
2014-06-12 5:56 [RFC - WIP v2 00/10] conf-files: New recipe to consolidate config file Saul Wold
2014-06-12 5:56 ` [RFC - WIP v2 01/10] conf-files: New recipe to create single recipe for config files Saul Wold
@ 2014-06-12 5:56 ` Saul Wold
2014-06-13 10:35 ` Paul Eggleton
2014-06-12 5:56 ` [RFC - WIP v2 03/10] alsa-state: " Saul Wold
` (8 subsequent siblings)
10 siblings, 1 reply; 18+ messages in thread
From: Saul Wold @ 2014-06-12 5:56 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-bsp/apmd/apmd_3.2.2-14.bb | 5 +----
.../{apmd/apmd-3.2.2-14 => conf-files/conf-files}/apmd_proxy.conf | 0
2 files changed, 1 insertion(+), 4 deletions(-)
rename meta/recipes-bsp/{apmd/apmd-3.2.2-14 => conf-files/conf-files}/apmd_proxy.conf (100%)
diff --git a/meta/recipes-bsp/apmd/apmd_3.2.2-14.bb b/meta/recipes-bsp/apmd/apmd_3.2.2-14.bb
index ab7de65..b0d6f10 100644
--- a/meta/recipes-bsp/apmd/apmd_3.2.2-14.bb
+++ b/meta/recipes-bsp/apmd/apmd_3.2.2-14.bb
@@ -17,7 +17,6 @@ SRC_URI = "${DEBIAN_MIRROR}/main/a/apmd/apmd_3.2.2.orig.tar.gz;name=tarball \
file://init \
file://default \
file://apmd_proxy \
- file://apmd_proxy.conf \
file://apmd.service"
SRC_URI[tarball.md5sum] = "b1e6309e8331e0f4e6efd311c2d97fa8"
@@ -28,7 +27,7 @@ SRC_URI[patch.sha256sum] = "7905ff96be93d725544d0040e425c42f9c05580db3c272f11cff
S = "${WORKDIR}/apmd-3.2.2.orig"
-inherit update-rc.d systemd
+inherit update-rc.d systemd conf-files
INITSCRIPT_NAME = "apmd"
INITSCRIPT_PARAMS = "defaults"
@@ -54,13 +53,11 @@ do_install() {
install -d ${D}${sbindir}
install -d ${D}${bindir}
install -d ${D}${libdir}
- install -d ${D}${datadir}/apmd
install -d ${D}${includedir}
install -m 4755 ${S}/.libs/apm ${D}${bindir}/apm
install -m 0755 ${S}/.libs/apmd ${D}${sbindir}/apmd
install -m 0755 ${WORKDIR}/apmd_proxy ${D}${sysconfdir}/apm/
- install -m 0644 ${WORKDIR}/apmd_proxy.conf ${D}${datadir}/apmd/
install -m 0644 ${WORKDIR}/default ${D}${sysconfdir}/default/apmd
oe_libinstall -so libapm ${D}${libdir}
install -m 0644 apm.h ${D}${includedir}
diff --git a/meta/recipes-bsp/apmd/apmd-3.2.2-14/apmd_proxy.conf b/meta/recipes-bsp/conf-files/conf-files/apmd_proxy.conf
similarity index 100%
rename from meta/recipes-bsp/apmd/apmd-3.2.2-14/apmd_proxy.conf
rename to meta/recipes-bsp/conf-files/conf-files/apmd_proxy.conf
--
1.8.3.2
^ permalink raw reply related [flat|nested] 18+ messages in thread* [RFC - WIP v2 03/10] alsa-state: convert to use conf-files
2014-06-12 5:56 [RFC - WIP v2 00/10] conf-files: New recipe to consolidate config file Saul Wold
2014-06-12 5:56 ` [RFC - WIP v2 01/10] conf-files: New recipe to create single recipe for config files Saul Wold
2014-06-12 5:56 ` [RFC - WIP v2 02/10] apmd: convert to use conf-files Saul Wold
@ 2014-06-12 5:56 ` Saul Wold
2014-06-12 5:56 ` [RFC - WIP v2 04/10] formfactor: convert to conf-files Saul Wold
` (7 subsequent siblings)
10 siblings, 0 replies; 18+ messages in thread
From: Saul Wold @ 2014-06-12 5:56 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-bsp/alsa-state/alsa-state.bb | 9 +++------
.../{alsa-state/alsa-state => conf-files/conf-files}/asound.conf | 0
2 files changed, 3 insertions(+), 6 deletions(-)
rename meta/recipes-bsp/{alsa-state/alsa-state => conf-files/conf-files}/asound.conf (100%)
diff --git a/meta/recipes-bsp/alsa-state/alsa-state.bb b/meta/recipes-bsp/alsa-state/alsa-state.bb
index 874d6bb..029967c 100644
--- a/meta/recipes-bsp/alsa-state/alsa-state.bb
+++ b/meta/recipes-bsp/alsa-state/alsa-state.bb
@@ -13,12 +13,11 @@ PV = "0.2.0"
PR = "r5"
SRC_URI = "\
- file://asound.conf \
file://asound.state \
file://alsa-state-init \
"
-inherit update-rc.d
+inherit update-rc.d conf-files
INITSCRIPT_NAME = "alsa-state"
INITSCRIPT_PARAMS = "start 39 S . stop 31 0 6 ."
@@ -29,17 +28,15 @@ do_install() {
install -m 0755 ${WORKDIR}/alsa-state-init ${D}${sysconfdir}/init.d/alsa-state
install -d ${D}/${localstatedir}/lib/alsa
- install -m 0644 ${WORKDIR}/asound.conf ${D}${sysconfdir}
install -m 0644 ${WORKDIR}/*.state ${D}${localstatedir}/lib/alsa
}
PACKAGES += "alsa-states"
-RRECOMMENDS_alsa-state = "alsa-states"
+RRECOMMENDS_${PN} = "alsa-states"
RDEPENDS_${PN} = "alsa-utils-alsactl"
-FILES_${PN} = "${sysconfdir}/init.d ${sysconfdir}/asound.conf"
-CONFFILES_${PN} = "${sysconfdir}/asound.conf"
+FILES_${PN} = "${sysconfdir}/init.d"
FILES_alsa-states = "${localstatedir}/lib/alsa/*.state"
diff --git a/meta/recipes-bsp/alsa-state/alsa-state/asound.conf b/meta/recipes-bsp/conf-files/conf-files/asound.conf
similarity index 100%
rename from meta/recipes-bsp/alsa-state/alsa-state/asound.conf
rename to meta/recipes-bsp/conf-files/conf-files/asound.conf
--
1.8.3.2
^ permalink raw reply related [flat|nested] 18+ messages in thread* [RFC - WIP v2 04/10] formfactor: convert to conf-files
2014-06-12 5:56 [RFC - WIP v2 00/10] conf-files: New recipe to consolidate config file Saul Wold
` (2 preceding siblings ...)
2014-06-12 5:56 ` [RFC - WIP v2 03/10] alsa-state: " Saul Wold
@ 2014-06-12 5:56 ` Saul Wold
2014-06-12 5:56 ` [RFC - WIP v2 05/10] connman: convert to use conf-files Saul Wold
` (6 subsequent siblings)
10 siblings, 0 replies; 18+ messages in thread
From: Saul Wold @ 2014-06-12 5:56 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../{formfactor/files => conf-files/conf-files}/machconfig | 0
.../{formfactor/files => conf-files/conf-files}/qemuarm/machconfig | 0
.../files => conf-files/conf-files}/qemuarmv6/machconfig | 0
.../files => conf-files/conf-files}/qemuarmv7/machconfig | 0
.../files => conf-files/conf-files}/qemumips/machconfig | 0
.../{formfactor/files => conf-files/conf-files}/qemuppc/machconfig | 0
.../files => conf-files/conf-files}/qemux86-64/machconfig | 0
.../{formfactor/files => conf-files/conf-files}/qemux86/machconfig | 0
meta/recipes-bsp/formfactor/formfactor_0.0.bb | 7 +++----
9 files changed, 3 insertions(+), 4 deletions(-)
rename meta/recipes-bsp/{formfactor/files => conf-files/conf-files}/machconfig (100%)
rename meta/recipes-bsp/{formfactor/files => conf-files/conf-files}/qemuarm/machconfig (100%)
rename meta/recipes-bsp/{formfactor/files => conf-files/conf-files}/qemuarmv6/machconfig (100%)
rename meta/recipes-bsp/{formfactor/files => conf-files/conf-files}/qemuarmv7/machconfig (100%)
rename meta/recipes-bsp/{formfactor/files => conf-files/conf-files}/qemumips/machconfig (100%)
rename meta/recipes-bsp/{formfactor/files => conf-files/conf-files}/qemuppc/machconfig (100%)
rename meta/recipes-bsp/{formfactor/files => conf-files/conf-files}/qemux86-64/machconfig (100%)
rename meta/recipes-bsp/{formfactor/files => conf-files/conf-files}/qemux86/machconfig (100%)
diff --git a/meta/recipes-bsp/formfactor/files/machconfig b/meta/recipes-bsp/conf-files/conf-files/machconfig
similarity index 100%
rename from meta/recipes-bsp/formfactor/files/machconfig
rename to meta/recipes-bsp/conf-files/conf-files/machconfig
diff --git a/meta/recipes-bsp/formfactor/files/qemuarm/machconfig b/meta/recipes-bsp/conf-files/conf-files/qemuarm/machconfig
similarity index 100%
rename from meta/recipes-bsp/formfactor/files/qemuarm/machconfig
rename to meta/recipes-bsp/conf-files/conf-files/qemuarm/machconfig
diff --git a/meta/recipes-bsp/formfactor/files/qemuarmv6/machconfig b/meta/recipes-bsp/conf-files/conf-files/qemuarmv6/machconfig
similarity index 100%
rename from meta/recipes-bsp/formfactor/files/qemuarmv6/machconfig
rename to meta/recipes-bsp/conf-files/conf-files/qemuarmv6/machconfig
diff --git a/meta/recipes-bsp/formfactor/files/qemuarmv7/machconfig b/meta/recipes-bsp/conf-files/conf-files/qemuarmv7/machconfig
similarity index 100%
rename from meta/recipes-bsp/formfactor/files/qemuarmv7/machconfig
rename to meta/recipes-bsp/conf-files/conf-files/qemuarmv7/machconfig
diff --git a/meta/recipes-bsp/formfactor/files/qemumips/machconfig b/meta/recipes-bsp/conf-files/conf-files/qemumips/machconfig
similarity index 100%
rename from meta/recipes-bsp/formfactor/files/qemumips/machconfig
rename to meta/recipes-bsp/conf-files/conf-files/qemumips/machconfig
diff --git a/meta/recipes-bsp/formfactor/files/qemuppc/machconfig b/meta/recipes-bsp/conf-files/conf-files/qemuppc/machconfig
similarity index 100%
rename from meta/recipes-bsp/formfactor/files/qemuppc/machconfig
rename to meta/recipes-bsp/conf-files/conf-files/qemuppc/machconfig
diff --git a/meta/recipes-bsp/formfactor/files/qemux86-64/machconfig b/meta/recipes-bsp/conf-files/conf-files/qemux86-64/machconfig
similarity index 100%
rename from meta/recipes-bsp/formfactor/files/qemux86-64/machconfig
rename to meta/recipes-bsp/conf-files/conf-files/qemux86-64/machconfig
diff --git a/meta/recipes-bsp/formfactor/files/qemux86/machconfig b/meta/recipes-bsp/conf-files/conf-files/qemux86/machconfig
similarity index 100%
rename from meta/recipes-bsp/formfactor/files/qemux86/machconfig
rename to meta/recipes-bsp/conf-files/conf-files/qemux86/machconfig
diff --git a/meta/recipes-bsp/formfactor/formfactor_0.0.bb b/meta/recipes-bsp/formfactor/formfactor_0.0.bb
index d1ae2a2..6410237 100644
--- a/meta/recipes-bsp/formfactor/formfactor_0.0.bb
+++ b/meta/recipes-bsp/formfactor/formfactor_0.0.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
PR = "r45"
-SRC_URI = "file://config file://machconfig"
+SRC_URI = "file://config"
S = "${WORKDIR}"
PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -15,7 +15,6 @@ do_install() {
# Only install file if it has a contents
install -d ${D}${sysconfdir}/formfactor/
install -m 0644 ${S}/config ${D}${sysconfdir}/formfactor/
- if [ -s "${S}/machconfig" ]; then
- install -m 0644 ${S}/machconfig ${D}${sysconfdir}/formfactor/
- fi
}
+
+inherit conf-files
--
1.8.3.2
^ permalink raw reply related [flat|nested] 18+ messages in thread* [RFC - WIP v2 05/10] connman: convert to use conf-files
2014-06-12 5:56 [RFC - WIP v2 00/10] conf-files: New recipe to consolidate config file Saul Wold
` (3 preceding siblings ...)
2014-06-12 5:56 ` [RFC - WIP v2 04/10] formfactor: convert to conf-files Saul Wold
@ 2014-06-12 5:56 ` Saul Wold
2014-06-12 5:56 ` [RFC - WIP v2 06/10] init-ifupdown: " Saul Wold
` (5 subsequent siblings)
10 siblings, 0 replies; 18+ messages in thread
From: Saul Wold @ 2014-06-12 5:56 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../conf-files/conf-files}/qemuall/wired-setup | 0
.../conf-files/conf-files}/qemuall/wired.config | 0
meta/recipes-connectivity/connman/connman-conf.bb | 24 ----------------------
meta/recipes-connectivity/connman/connman.inc | 2 +-
meta/recipes-connectivity/connman/connman_1.23.bb | 2 +-
5 files changed, 2 insertions(+), 26 deletions(-)
rename meta/{recipes-connectivity/connman/connman-conf => recipes-bsp/conf-files/conf-files}/qemuall/wired-setup (100%)
rename meta/{recipes-connectivity/connman/connman-conf => recipes-bsp/conf-files/conf-files}/qemuall/wired.config (100%)
delete mode 100644 meta/recipes-connectivity/connman/connman-conf.bb
diff --git a/meta/recipes-connectivity/connman/connman-conf/qemuall/wired-setup b/meta/recipes-bsp/conf-files/conf-files/qemuall/wired-setup
similarity index 100%
rename from meta/recipes-connectivity/connman/connman-conf/qemuall/wired-setup
rename to meta/recipes-bsp/conf-files/conf-files/qemuall/wired-setup
diff --git a/meta/recipes-connectivity/connman/connman-conf/qemuall/wired.config b/meta/recipes-bsp/conf-files/conf-files/qemuall/wired.config
similarity index 100%
rename from meta/recipes-connectivity/connman/connman-conf/qemuall/wired.config
rename to meta/recipes-bsp/conf-files/conf-files/qemuall/wired.config
diff --git a/meta/recipes-connectivity/connman/connman-conf.bb b/meta/recipes-connectivity/connman/connman-conf.bb
deleted file mode 100644
index af72640..0000000
--- a/meta/recipes-connectivity/connman/connman-conf.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-SUMMARY = "Connman config to setup wired interface on qemu machines"
-DESCRIPTION = "This is the ConnMan configuration to set up a Wired \
-network interface for a qemu machine."
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
-
-SRC_URI_append_qemuall = "file://wired.config \
- file://wired-setup \
- "
-PR = "r2"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-FILES_${PN} = "${localstatedir}/* ${libdir}/*"
-
-do_install() {
- #Configure Wired network interface in case of qemu* machines
- if test -e ${WORKDIR}/wired.config && test -e ${WORKDIR}/wired-setup; then
- install -d ${D}${localstatedir}/lib/connman
- install -m 0644 ${WORKDIR}/wired.config ${D}${localstatedir}/lib/connman
- install -d ${D}${libdir}/connman
- install -m 0755 ${WORKDIR}/wired-setup ${D}${libdir}/connman
- fi
-}
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index f121a81..e5a6109 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -66,7 +66,7 @@ SYSTEMD_SERVICE_${PN} = "connman.service"
SYSTEMD_SERVICE_${PN}-vpn = "connman-vpn.service"
SYSTEMD_WIRED_SETUP = "ExecStartPre=-${libdir}/connman/wired-setup"
-inherit autotools-brokensep pkgconfig systemd update-rc.d
+inherit autotools-brokensep pkgconfig systemd update-rc.d conf-files
do_configure_append () {
sed -i "s#ExecStart=#${SYSTEMD_WIRED_SETUP}\nExecStart=#" ${S}/src/connman.service
diff --git a/meta/recipes-connectivity/connman/connman_1.23.bb b/meta/recipes-connectivity/connman/connman_1.23.bb
index 43501af..dd21f6d 100644
--- a/meta/recipes-connectivity/connman/connman_1.23.bb
+++ b/meta/recipes-connectivity/connman/connman_1.23.bb
@@ -8,4 +8,4 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
SRC_URI[md5sum] = "f835b8137ab198e0af5deab043e2890a"
SRC_URI[sha256sum] = "1dcac1d059d5303343e544fca0d0e76837cfb32f36e4a607a71c1b65ccf007c5"
-RRECOMMENDS_${PN} = "connman-conf"
+
--
1.8.3.2
^ permalink raw reply related [flat|nested] 18+ messages in thread* [RFC - WIP v2 06/10] init-ifupdown: convert to use conf-files
2014-06-12 5:56 [RFC - WIP v2 00/10] conf-files: New recipe to consolidate config file Saul Wold
` (4 preceding siblings ...)
2014-06-12 5:56 ` [RFC - WIP v2 05/10] connman: convert to use conf-files Saul Wold
@ 2014-06-12 5:56 ` Saul Wold
2014-06-12 5:56 ` [RFC - WIP v2 07/10] pointer: convert to conf-files and remove Saul Wold
` (4 subsequent siblings)
10 siblings, 0 replies; 18+ messages in thread
From: Saul Wold @ 2014-06-12 5:56 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../conf-files/conf-files}/interfaces | 0
.../conf-files/conf-files}/qemuarm/interfaces | 0
.../conf-files/conf-files}/qemuarmv6/interfaces | 0
.../conf-files/conf-files}/qemuarmv7/interfaces | 0
.../conf-files/conf-files}/qemumips/interfaces | 0
.../conf-files/conf-files}/qemumips64/interfaces | 0
.../conf-files/conf-files}/qemuppc/interfaces | 0
.../conf-files/conf-files}/qemush4/interfaces | 0
.../conf-files/conf-files}/qemux86-64/interfaces | 0
.../conf-files/conf-files}/qemux86/interfaces | 0
meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb | 6 +-----
11 files changed, 1 insertion(+), 5 deletions(-)
rename meta/{recipes-core/init-ifupdown/init-ifupdown-1.0 => recipes-bsp/conf-files/conf-files}/interfaces (100%)
rename meta/{recipes-core/init-ifupdown/init-ifupdown-1.0 => recipes-bsp/conf-files/conf-files}/qemuarm/interfaces (100%)
rename meta/{recipes-core/init-ifupdown/init-ifupdown-1.0 => recipes-bsp/conf-files/conf-files}/qemuarmv6/interfaces (100%)
rename meta/{recipes-core/init-ifupdown/init-ifupdown-1.0 => recipes-bsp/conf-files/conf-files}/qemuarmv7/interfaces (100%)
rename meta/{recipes-core/init-ifupdown/init-ifupdown-1.0 => recipes-bsp/conf-files/conf-files}/qemumips/interfaces (100%)
rename meta/{recipes-core/init-ifupdown/init-ifupdown-1.0 => recipes-bsp/conf-files/conf-files}/qemumips64/interfaces (100%)
rename meta/{recipes-core/init-ifupdown/init-ifupdown-1.0 => recipes-bsp/conf-files/conf-files}/qemuppc/interfaces (100%)
rename meta/{recipes-core/init-ifupdown/init-ifupdown-1.0 => recipes-bsp/conf-files/conf-files}/qemush4/interfaces (100%)
rename meta/{recipes-core/init-ifupdown/init-ifupdown-1.0 => recipes-bsp/conf-files/conf-files}/qemux86-64/interfaces (100%)
rename meta/{recipes-core/init-ifupdown/init-ifupdown-1.0 => recipes-bsp/conf-files/conf-files}/qemux86/interfaces (100%)
diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/interfaces b/meta/recipes-bsp/conf-files/conf-files/interfaces
similarity index 100%
rename from meta/recipes-core/init-ifupdown/init-ifupdown-1.0/interfaces
rename to meta/recipes-bsp/conf-files/conf-files/interfaces
diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarm/interfaces b/meta/recipes-bsp/conf-files/conf-files/qemuarm/interfaces
similarity index 100%
rename from meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarm/interfaces
rename to meta/recipes-bsp/conf-files/conf-files/qemuarm/interfaces
diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarmv6/interfaces b/meta/recipes-bsp/conf-files/conf-files/qemuarmv6/interfaces
similarity index 100%
rename from meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarmv6/interfaces
rename to meta/recipes-bsp/conf-files/conf-files/qemuarmv6/interfaces
diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarmv7/interfaces b/meta/recipes-bsp/conf-files/conf-files/qemuarmv7/interfaces
similarity index 100%
rename from meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuarmv7/interfaces
rename to meta/recipes-bsp/conf-files/conf-files/qemuarmv7/interfaces
diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemumips/interfaces b/meta/recipes-bsp/conf-files/conf-files/qemumips/interfaces
similarity index 100%
rename from meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemumips/interfaces
rename to meta/recipes-bsp/conf-files/conf-files/qemumips/interfaces
diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemumips64/interfaces b/meta/recipes-bsp/conf-files/conf-files/qemumips64/interfaces
similarity index 100%
rename from meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemumips64/interfaces
rename to meta/recipes-bsp/conf-files/conf-files/qemumips64/interfaces
diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuppc/interfaces b/meta/recipes-bsp/conf-files/conf-files/qemuppc/interfaces
similarity index 100%
rename from meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemuppc/interfaces
rename to meta/recipes-bsp/conf-files/conf-files/qemuppc/interfaces
diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemush4/interfaces b/meta/recipes-bsp/conf-files/conf-files/qemush4/interfaces
similarity index 100%
rename from meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemush4/interfaces
rename to meta/recipes-bsp/conf-files/conf-files/qemush4/interfaces
diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemux86-64/interfaces b/meta/recipes-bsp/conf-files/conf-files/qemux86-64/interfaces
similarity index 100%
rename from meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemux86-64/interfaces
rename to meta/recipes-bsp/conf-files/conf-files/qemux86-64/interfaces
diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemux86/interfaces b/meta/recipes-bsp/conf-files/conf-files/qemux86/interfaces
similarity index 100%
rename from meta/recipes-core/init-ifupdown/init-ifupdown-1.0/qemux86/interfaces
rename to meta/recipes-bsp/conf-files/conf-files/qemux86/interfaces
diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb b/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb
index 3d88506..ca65c79 100644
--- a/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb
+++ b/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb
@@ -6,14 +6,13 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://${WORKDIR}/copyright;md5=3dd6192d306f582dee7687da3d8748ab"
PR = "r7"
-inherit update-rc.d
+inherit update-rc.d conf-files
INITSCRIPT_NAME = "networking"
INITSCRIPT_PARAMS = "start 01 2 3 4 5 . stop 80 0 6 1 ."
SRC_URI = "file://copyright \
file://init \
- file://interfaces \
file://nfsroot"
do_install () {
@@ -23,7 +22,6 @@ do_install () {
${D}${sysconfdir}/network/if-down.d \
${D}${sysconfdir}/network/if-post-down.d
install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/networking
- install -m 0644 ${WORKDIR}/interfaces ${D}${sysconfdir}/network/interfaces
install -m 0755 ${WORKDIR}/nfsroot ${D}${sysconfdir}/network/if-pre-up.d
}
@@ -35,5 +33,3 @@ do_install_append_qemuall () {
PACKAGE_ARCH_qemuall = "${MACHINE_ARCH}"
RDEPENDS_${PN} = "netbase"
RCONFLICTS_${PN} = "netbase (< 1:5.0)"
-
-CONFFILES_${PN} = "${sysconfdir}/network/interfaces"
--
1.8.3.2
^ permalink raw reply related [flat|nested] 18+ messages in thread* [RFC - WIP v2 07/10] pointer: convert to conf-files and remove
2014-06-12 5:56 [RFC - WIP v2 00/10] conf-files: New recipe to consolidate config file Saul Wold
` (5 preceding siblings ...)
2014-06-12 5:56 ` [RFC - WIP v2 06/10] init-ifupdown: " Saul Wold
@ 2014-06-12 5:56 ` Saul Wold
2014-06-12 5:56 ` [RFC - WIP v2 08/10] xserver-xf86-config: convert to use " Saul Wold
` (3 subsequent siblings)
10 siblings, 0 replies; 18+ messages in thread
From: Saul Wold @ 2014-06-12 5:56 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../conf-files}/pointercal | 0
.../conf-files}/qemuarm/pointercal | 0
.../conf-files}/qemuarmv6/pointercal | 0
.../conf-files}/qemuarmv7/pointercal | 0
.../conf-files}/qemumips/pointercal | 0
.../conf-files}/qemuppc/pointercal | Bin
.../conf-files}/qemux86-64/pointercal | 0
.../conf-files}/qemux86/pointercal | 0
meta/recipes-bsp/pointercal/pointercal/COPYING | 2 --
meta/recipes-bsp/pointercal/pointercal_0.0.bb | 22 ---------------------
10 files changed, 24 deletions(-)
rename meta/recipes-bsp/{pointercal/pointercal => conf-files/conf-files}/pointercal (100%)
rename meta/recipes-bsp/{pointercal/pointercal => conf-files/conf-files}/qemuarm/pointercal (100%)
rename meta/recipes-bsp/{pointercal/pointercal => conf-files/conf-files}/qemuarmv6/pointercal (100%)
rename meta/recipes-bsp/{pointercal/pointercal => conf-files/conf-files}/qemuarmv7/pointercal (100%)
rename meta/recipes-bsp/{pointercal/pointercal => conf-files/conf-files}/qemumips/pointercal (100%)
rename meta/recipes-bsp/{pointercal/pointercal => conf-files/conf-files}/qemuppc/pointercal (100%)
rename meta/recipes-bsp/{pointercal/pointercal => conf-files/conf-files}/qemux86-64/pointercal (100%)
rename meta/recipes-bsp/{pointercal/pointercal => conf-files/conf-files}/qemux86/pointercal (100%)
delete mode 100644 meta/recipes-bsp/pointercal/pointercal/COPYING
delete mode 100644 meta/recipes-bsp/pointercal/pointercal_0.0.bb
diff --git a/meta/recipes-bsp/pointercal/pointercal/pointercal b/meta/recipes-bsp/conf-files/conf-files/pointercal
similarity index 100%
rename from meta/recipes-bsp/pointercal/pointercal/pointercal
rename to meta/recipes-bsp/conf-files/conf-files/pointercal
diff --git a/meta/recipes-bsp/pointercal/pointercal/qemuarm/pointercal b/meta/recipes-bsp/conf-files/conf-files/qemuarm/pointercal
similarity index 100%
rename from meta/recipes-bsp/pointercal/pointercal/qemuarm/pointercal
rename to meta/recipes-bsp/conf-files/conf-files/qemuarm/pointercal
diff --git a/meta/recipes-bsp/pointercal/pointercal/qemuarmv6/pointercal b/meta/recipes-bsp/conf-files/conf-files/qemuarmv6/pointercal
similarity index 100%
rename from meta/recipes-bsp/pointercal/pointercal/qemuarmv6/pointercal
rename to meta/recipes-bsp/conf-files/conf-files/qemuarmv6/pointercal
diff --git a/meta/recipes-bsp/pointercal/pointercal/qemuarmv7/pointercal b/meta/recipes-bsp/conf-files/conf-files/qemuarmv7/pointercal
similarity index 100%
rename from meta/recipes-bsp/pointercal/pointercal/qemuarmv7/pointercal
rename to meta/recipes-bsp/conf-files/conf-files/qemuarmv7/pointercal
diff --git a/meta/recipes-bsp/pointercal/pointercal/qemumips/pointercal b/meta/recipes-bsp/conf-files/conf-files/qemumips/pointercal
similarity index 100%
rename from meta/recipes-bsp/pointercal/pointercal/qemumips/pointercal
rename to meta/recipes-bsp/conf-files/conf-files/qemumips/pointercal
diff --git a/meta/recipes-bsp/pointercal/pointercal/qemuppc/pointercal b/meta/recipes-bsp/conf-files/conf-files/qemuppc/pointercal
similarity index 100%
rename from meta/recipes-bsp/pointercal/pointercal/qemuppc/pointercal
rename to meta/recipes-bsp/conf-files/conf-files/qemuppc/pointercal
diff --git a/meta/recipes-bsp/pointercal/pointercal/qemux86-64/pointercal b/meta/recipes-bsp/conf-files/conf-files/qemux86-64/pointercal
similarity index 100%
rename from meta/recipes-bsp/pointercal/pointercal/qemux86-64/pointercal
rename to meta/recipes-bsp/conf-files/conf-files/qemux86-64/pointercal
diff --git a/meta/recipes-bsp/pointercal/pointercal/qemux86/pointercal b/meta/recipes-bsp/conf-files/conf-files/qemux86/pointercal
similarity index 100%
rename from meta/recipes-bsp/pointercal/pointercal/qemux86/pointercal
rename to meta/recipes-bsp/conf-files/conf-files/qemux86/pointercal
diff --git a/meta/recipes-bsp/pointercal/pointercal/COPYING b/meta/recipes-bsp/pointercal/pointercal/COPYING
deleted file mode 100644
index 63f5293..0000000
--- a/meta/recipes-bsp/pointercal/pointercal/COPYING
+++ /dev/null
@@ -1,2 +0,0 @@
-This is a blank COPYING file, and should be filled in by original author in future.
-
diff --git a/meta/recipes-bsp/pointercal/pointercal_0.0.bb b/meta/recipes-bsp/pointercal/pointercal_0.0.bb
deleted file mode 100644
index 5029c4a..0000000
--- a/meta/recipes-bsp/pointercal/pointercal_0.0.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-SUMMARY = "Touchscreen calibration data"
-SECTION = "base"
-PR = "r11"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=4b5fcfc87fb615860d398b5e38685edf"
-
-SRC_URI = "file://pointercal \
- file://COPYING"
-
-S = "${WORKDIR}"
-
-do_install() {
- # Only install file if it has a contents
- if [ -s ${S}/pointercal ]; then
- install -d ${D}${sysconfdir}/
- install -m 0644 ${S}/pointercal ${D}${sysconfdir}/
- fi
-}
-
-ALLOW_EMPTY_${PN} = "1"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-INHIBIT_DEFAULT_DEPS = "1"
\ No newline at end of file
--
1.8.3.2
^ permalink raw reply related [flat|nested] 18+ messages in thread* [RFC - WIP v2 08/10] xserver-xf86-config: convert to use conf-files and remove
2014-06-12 5:56 [RFC - WIP v2 00/10] conf-files: New recipe to consolidate config file Saul Wold
` (6 preceding siblings ...)
2014-06-12 5:56 ` [RFC - WIP v2 07/10] pointer: convert to conf-files and remove Saul Wold
@ 2014-06-12 5:56 ` Saul Wold
2014-06-12 5:56 ` [RFC - WIP v2 09/10] pointercal-xinput: convert to " Saul Wold
` (2 subsequent siblings)
10 siblings, 0 replies; 18+ messages in thread
From: Saul Wold @ 2014-06-12 5:56 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../conf-files/conf-files}/qemuarm/xorg.conf | 0
.../conf-files/conf-files}/qemumips/xorg.conf | 0
.../conf-files/conf-files}/qemumips64/xorg.conf | 0
.../conf-files/conf-files}/qemuppc/xorg.conf | 0
.../conf-files/conf-files}/qemush4/xorg.conf | 0
.../conf-files/conf-files}/qemux86-64/xorg.conf | 0
.../conf-files/conf-files}/qemux86/xorg.conf | 0
.../conf-files/conf-files}/xorg.conf | 0
.../xorg-xserver/xserver-xf86-config_0.1.bb | 20 --------------------
9 files changed, 20 deletions(-)
rename meta/{recipes-graphics/xorg-xserver/xserver-xf86-config => recipes-bsp/conf-files/conf-files}/qemuarm/xorg.conf (100%)
rename meta/{recipes-graphics/xorg-xserver/xserver-xf86-config => recipes-bsp/conf-files/conf-files}/qemumips/xorg.conf (100%)
rename meta/{recipes-graphics/xorg-xserver/xserver-xf86-config => recipes-bsp/conf-files/conf-files}/qemumips64/xorg.conf (100%)
rename meta/{recipes-graphics/xorg-xserver/xserver-xf86-config => recipes-bsp/conf-files/conf-files}/qemuppc/xorg.conf (100%)
rename meta/{recipes-graphics/xorg-xserver/xserver-xf86-config => recipes-bsp/conf-files/conf-files}/qemush4/xorg.conf (100%)
rename meta/{recipes-graphics/xorg-xserver/xserver-xf86-config => recipes-bsp/conf-files/conf-files}/qemux86-64/xorg.conf (100%)
rename meta/{recipes-graphics/xorg-xserver/xserver-xf86-config => recipes-bsp/conf-files/conf-files}/qemux86/xorg.conf (100%)
rename meta/{recipes-graphics/xorg-xserver/xserver-xf86-config => recipes-bsp/conf-files/conf-files}/xorg.conf (100%)
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuarm/xorg.conf b/meta/recipes-bsp/conf-files/conf-files/qemuarm/xorg.conf
similarity index 100%
rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuarm/xorg.conf
rename to meta/recipes-bsp/conf-files/conf-files/qemuarm/xorg.conf
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf b/meta/recipes-bsp/conf-files/conf-files/qemumips/xorg.conf
similarity index 100%
rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips/xorg.conf
rename to meta/recipes-bsp/conf-files/conf-files/qemumips/xorg.conf
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf b/meta/recipes-bsp/conf-files/conf-files/qemumips64/xorg.conf
similarity index 100%
rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemumips64/xorg.conf
rename to meta/recipes-bsp/conf-files/conf-files/qemumips64/xorg.conf
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuppc/xorg.conf b/meta/recipes-bsp/conf-files/conf-files/qemuppc/xorg.conf
similarity index 100%
rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuppc/xorg.conf
rename to meta/recipes-bsp/conf-files/conf-files/qemuppc/xorg.conf
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemush4/xorg.conf b/meta/recipes-bsp/conf-files/conf-files/qemush4/xorg.conf
similarity index 100%
rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemush4/xorg.conf
rename to meta/recipes-bsp/conf-files/conf-files/qemush4/xorg.conf
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86-64/xorg.conf b/meta/recipes-bsp/conf-files/conf-files/qemux86-64/xorg.conf
similarity index 100%
rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86-64/xorg.conf
rename to meta/recipes-bsp/conf-files/conf-files/qemux86-64/xorg.conf
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf b/meta/recipes-bsp/conf-files/conf-files/qemux86/xorg.conf
similarity index 100%
rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf
rename to meta/recipes-bsp/conf-files/conf-files/qemux86/xorg.conf
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/xorg.conf b/meta/recipes-bsp/conf-files/conf-files/xorg.conf
similarity index 100%
rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-config/xorg.conf
rename to meta/recipes-bsp/conf-files/conf-files/xorg.conf
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
deleted file mode 100644
index 549c7c8..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-SUMMARY = "X.Org X server configuration file"
-HOMEPAGE = "http://www.x.org"
-SECTION = "x11/base"
-LICENSE = "MIT-X"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PR = "r33"
-
-SRC_URI = "file://xorg.conf"
-
-CONFFILES_${PN} = "${sysconfdir}/X11/xorg.conf"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-ALLOW_EMPTY_${PN} = "1"
-
-do_install () {
- if test -s ${WORKDIR}/xorg.conf; then
- install -d ${D}/${sysconfdir}/X11
- install -m 0644 ${WORKDIR}/xorg.conf ${D}/${sysconfdir}/X11/
- fi
-}
--
1.8.3.2
^ permalink raw reply related [flat|nested] 18+ messages in thread* [RFC - WIP v2 09/10] pointercal-xinput: convert to conf-files and remove
2014-06-12 5:56 [RFC - WIP v2 00/10] conf-files: New recipe to consolidate config file Saul Wold
` (7 preceding siblings ...)
2014-06-12 5:56 ` [RFC - WIP v2 08/10] xserver-xf86-config: convert to use " Saul Wold
@ 2014-06-12 5:56 ` Saul Wold
2014-06-12 5:56 ` [RFC - WIP v2 10/10] xorg-config: move xorg.conf files into conf-files as bbappend Saul Wold
2014-06-13 13:30 ` [RFC - WIP v2 00/10] conf-files: New recipe to consolidate config file Paul Eggleton
10 siblings, 0 replies; 18+ messages in thread
From: Saul Wold @ 2014-06-12 5:56 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../conf-files/conf-files}/pointercal.xinput | 0
.../xinput-calibrator/pointercal-xinput_0.0.bb | 20 --------------------
.../xinput-calibrator/xinput-calibrator_git.bb | 3 +--
3 files changed, 1 insertion(+), 22 deletions(-)
rename meta/{recipes-graphics/xinput-calibrator/pointercal-xinput => recipes-bsp/conf-files/conf-files}/pointercal.xinput (100%)
delete mode 100644 meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb
diff --git a/meta/recipes-graphics/xinput-calibrator/pointercal-xinput/pointercal.xinput b/meta/recipes-bsp/conf-files/conf-files/pointercal.xinput
similarity index 100%
rename from meta/recipes-graphics/xinput-calibrator/pointercal-xinput/pointercal.xinput
rename to meta/recipes-bsp/conf-files/conf-files/pointercal.xinput
diff --git a/meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb b/meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb
deleted file mode 100644
index 65348c3..0000000
--- a/meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-SUMMARY = "Touchscreen calibration data from xinput-calibrator"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-
-PR = "r7"
-
-SRC_URI = "file://pointercal.xinput"
-S = "${WORKDIR}"
-
-do_install() {
- # Only install file if it has a contents
- if [ -s ${S}/pointercal.xinput ] &&\
- [ ! -n "$(head -n1 ${S}/pointercal.xinput|grep "replace.*pointercal\.xinput")" ]; then
- install -d ${D}${sysconfdir}/
- install -m 0644 ${S}/pointercal.xinput ${D}${sysconfdir}/
- fi
-}
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-CONFFILES_${PN} = "${sysconfdir}/pointercal.xinput"
diff --git a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
index 562434f..65506e3 100644
--- a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
+++ b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb
@@ -7,7 +7,7 @@ DEPENDS = "virtual/libx11 libxi"
PV = "0.7.5+git${SRCPV}"
PR = "r6"
-inherit autotools pkgconfig
+inherit autotools pkgconfig conf-files
SRCREV = "c01c5af807cb4b0157b882ab07a893df9a810111"
SRC_URI = "git://github.com/tias/xinput_calibrator.git \
@@ -32,4 +32,3 @@ do_install_append() {
FILES_${PN} += "${sysconfdir}/xdg/autostart"
RDEPENDS_${PN} = "xinput formfactor"
-RRECOMMENDS_${PN} = "pointercal-xinput"
--
1.8.3.2
^ permalink raw reply related [flat|nested] 18+ messages in thread* [RFC - WIP v2 10/10] xorg-config: move xorg.conf files into conf-files as bbappend
2014-06-12 5:56 [RFC - WIP v2 00/10] conf-files: New recipe to consolidate config file Saul Wold
` (8 preceding siblings ...)
2014-06-12 5:56 ` [RFC - WIP v2 09/10] pointercal-xinput: convert to " Saul Wold
@ 2014-06-12 5:56 ` Saul Wold
2014-06-13 13:30 ` [RFC - WIP v2 00/10] conf-files: New recipe to consolidate config file Paul Eggleton
10 siblings, 0 replies; 18+ messages in thread
From: Saul Wold @ 2014-06-12 5:56 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../conf-files/conf-files}/genericx86-64/xorg.conf | 0
.../conf-files/conf-files}/genericx86/xorg.conf | 0
.../conf-files/conf-files_%.bbappend} | 0
3 files changed, 0 insertions(+), 0 deletions(-)
rename meta-yocto-bsp/{recipes-graphics/xorg-xserver/xserver-xf86-config => recipes-bsp/conf-files/conf-files}/genericx86-64/xorg.conf (100%)
rename meta-yocto-bsp/{recipes-graphics/xorg-xserver/xserver-xf86-config => recipes-bsp/conf-files/conf-files}/genericx86/xorg.conf (100%)
rename meta-yocto-bsp/{recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend => recipes-bsp/conf-files/conf-files_%.bbappend} (100%)
diff --git a/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/genericx86-64/xorg.conf b/meta-yocto-bsp/recipes-bsp/conf-files/conf-files/genericx86-64/xorg.conf
similarity index 100%
rename from meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/genericx86-64/xorg.conf
rename to meta-yocto-bsp/recipes-bsp/conf-files/conf-files/genericx86-64/xorg.conf
diff --git a/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/genericx86/xorg.conf b/meta-yocto-bsp/recipes-bsp/conf-files/conf-files/genericx86/xorg.conf
similarity index 100%
rename from meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/genericx86/xorg.conf
rename to meta-yocto-bsp/recipes-bsp/conf-files/conf-files/genericx86/xorg.conf
diff --git a/meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend b/meta-yocto-bsp/recipes-bsp/conf-files/conf-files_%.bbappend
similarity index 100%
rename from meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
rename to meta-yocto-bsp/recipes-bsp/conf-files/conf-files_%.bbappend
--
1.8.3.2
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [RFC - WIP v2 00/10] conf-files: New recipe to consolidate config file
2014-06-12 5:56 [RFC - WIP v2 00/10] conf-files: New recipe to consolidate config file Saul Wold
` (9 preceding siblings ...)
2014-06-12 5:56 ` [RFC - WIP v2 10/10] xorg-config: move xorg.conf files into conf-files as bbappend Saul Wold
@ 2014-06-13 13:30 ` Paul Eggleton
10 siblings, 0 replies; 18+ messages in thread
From: Paul Eggleton @ 2014-06-13 13:30 UTC (permalink / raw)
To: Saul Wold, openembedded-core
On Wednesday 11 June 2014 22:56:19 Saul Wold wrote:
> This is a little further along, I would really like to get some
> feedback on the direction I am taking this.
>
> The idea is that a block of anonymous code will generate all the
> metadata and do_install() function for the existing config files
> such that a .bbappend can be created to override specific files
> from a single recipe instead of from 10-12 different .bbappends.
I have some reservations about this change as-is. I certainly accept that
currently the placement of typical BSP config files is a bit of a mess, and new
users definitely find it difficult to know where to go to change a particular file;
however there will always be config files this recipe doesn't cover. Most
significantly, it also requires everyone with existing BSP and distro layers to
go and migrate their bbappends over to the new structure, for not that much
gain. If we are going to go down this route, we absolutely must have a script
which migrates existing bbappends to this new layout. We'll also need to
ensure runtime upgrades work, i.e. PR values will have to increase from the
old packages to the new ones provided by the single recipe.
As a more general improvement in this area, I'd really like to see us have
some tooling around finding where a particular config file (or other file I want
to replace) comes from and then creating the bbappend to substitute my
version. We have the part that tracks down the recipe from a file - albeit in a
not-very-easy-to-use form - in scripts/oe-pkgdata-util (with its "find-path"
command); Toaster has the functionality to do this as well. This solution has
the benefit of being able to work for any configuration file (or other file) that
any recipe in any layer introduces. In fact this will be of benefit even if we
decide to go ahead with the conf-files move, so I've entered an enhancement
request to cover it separately:
https://bugzilla.yoctoproject.org/show_bug.cgi?id=6447
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 18+ messages in thread