Skip to contentSkip to conversation

conf/ucm: Remove intel UCM conf files from alsa-lib repo

PATCH In review [email protected] 3 participants 5 messages Mar 15, 2017 – Mar 20, 2017

lore
Share & tools
lore
#0 lore raw

cover conf/ucm: Remove intel UCM conf files from alsa-lib repo

From: Fuwei Tang <[email protected]>

Remove the intel UCM configs from alsa-lib repo.

Another series will add them to a dedicated UCM conf repo.License can be changed to BSD for intel files,and left as "unknown" for other conf files when they are moved from alsa-lib to the new repo.The alsa-lib LGPL license does not cover runtime configuration files.

Fuwei Tang (2):
conf/ucm: Remove conf files of broxton-rt298 platform conf/ucm: Remove conf files of skylake-rt286 platfrom

 configure.ac                                  |   2 -
 src/conf/ucm/Makefile.am                      |   2 +-
 src/conf/ucm/broxton-rt298/Hdmi1              |  22 -----
 src/conf/ucm/broxton-rt298/Hdmi2              |  14 ---
 src/conf/ucm/broxton-rt298/HiFi               | 129 --------------------------
 src/conf/ucm/broxton-rt298/Makefile.am        |   4 -
 src/conf/ucm/broxton-rt298/broxton-rt298.conf |  58 ------------
 src/conf/ucm/skylake-rt286/Hdmi1              |  20 ----
 src/conf/ucm/skylake-rt286/Hdmi2              |  20 ----
 src/conf/ucm/skylake-rt286/HiFi               | 129 --------------------------
 src/conf/ucm/skylake-rt286/Makefile.am        |   4 -
 src/conf/ucm/skylake-rt286/skylake-rt286.conf |  60 ------------
 12 files changed, 1 insertion(+), 463 deletions(-)
 delete mode 100644 src/conf/ucm/broxton-rt298/Hdmi1
 delete mode 100644 src/conf/ucm/broxton-rt298/Hdmi2
 delete mode 100644 src/conf/ucm/broxton-rt298/HiFi
 delete mode 100644 src/conf/ucm/broxton-rt298/Makefile.am
 delete mode 100644 src/conf/ucm/broxton-rt298/broxton-rt298.conf
 delete mode 100644 src/conf/ucm/skylake-rt286/Hdmi1
 delete mode 100644 src/conf/ucm/skylake-rt286/Hdmi2
 delete mode 100644 src/conf/ucm/skylake-rt286/HiFi
 delete mode 100644 src/conf/ucm/skylake-rt286/Makefile.am
 delete mode 100644 src/conf/ucm/skylake-rt286/skylake-rt286.conf
Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/2 conf/ucm: Remove conf files of broxton-rt298 platform

From: Fuwei Tang <[email protected]>

Remove conf files of broxton-rt298 platform from alsa-lib repo. The files will be moved to alsa-ucm-conf repo.

configure.ac +0 -1
index d645ab6..71bd852 100644
@@ -684,7 +684,6 @@ AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \
 	  src/conf/topology/bxtrt298/Makefile \
 	  alsalisp/Makefile aserver/Makefile \
 	  test/Makefile test/lsb/Makefile \
-	  src/conf/ucm/broxton-rt298/Makefile \
 	  utils/Makefile utils/alsa-lib.spec utils/alsa.pc)
 
 dnl Create asoundlib.h dynamically according to configure options
src/conf/ucm/Makefile.am +1 -1
index ea9b385..a11d324 100644
@@ -1 +1 @@
-SUBDIRS=DAISY-I2S PandaBoard PandaBoardES SDP4430 tegraalc5632 PAZ00 GoogleNyan broadwell-rt286 skylake-rt286 VEYRON-I2S chtrt5645 DB410c broxton-rt298
+SUBDIRS=DAISY-I2S PandaBoard PandaBoardES SDP4430 tegraalc5632 PAZ00 GoogleNyan broadwell-rt286 skylake-rt286 VEYRON-I2S chtrt5645 DB410c
src/conf/ucm/broxton-rt298/Hdmi1 deleted +0 -22
deleted file mode 100644
index 48514f4..0000000
@@ -1,22 +0,0 @@
-# Usecase for device HDMI1/Display Port stereo playback on Intel SKYLAKE/KABYLAKE platforms
-# For Audio in I2S mode
-
-SectionDevice."Hdmi1" {
-        Comment "HDMI/Display Port 1 Stereo"
-
-        EnableSequence [
-                exec "echo Hdmi1 EnableSequnece"
-        ]
-
-        DisableSequence [
-                exec "echo Hdmi1 DisableSequnece"
-        ]
-
-        Value {
-                PlaybackPCM "hw:broxtonrt298,4"
-                PlaybackChannels "2"
-                PlaybackPriority "3"
-                JackControl "HDMI/DP, pcm=4 Jack"
-        }
-}
-
src/conf/ucm/broxton-rt298/Hdmi2 deleted +0 -14
deleted file mode 100644
index 764f8b9..0000000
@@ -1,14 +0,0 @@
-# Usecase for device HDMI2/Display Port stereo playback on Intel Broxton platforms
-# For Audio in I2S mode
-
-SectionDevice."Hdmi2" {
-        Comment "HDMI/Display Port 2 Stereo"
-
-        Value {
-                PlaybackPCM "hw:broxtonrt298,5"
-                PlaybackChannels "2"
-                PlaybackPriority "4"
-                JackControl "HDMI/DP, pcm=5 Jack"
-        }
-}
-
src/conf/ucm/broxton-rt298/HiFi deleted +0 -129

129 lines not on this page · raw message

src/conf/ucm/broxton-rt298/Makefile.am deleted +0 -4
deleted file mode 100644
index 80f480e..0000000
@@ -1,4 +0,0 @@
-alsaconfigdir = @ALSA_CONFIG_DIR@
-ucmdir = $(alsaconfigdir)/ucm/broxton-rt298
-ucm_DATA = broxton-rt298.conf HiFi Hdmi1 Hdmi2
-EXTRA_DIST = $(ucm_DATA)
src/conf/ucm/broxton-rt298/broxton-rt298.conf deleted +0 -58

58 lines not on this page · raw message

Signature · 1 line
2.7.4
#2 lore raw

PATCH 2/2 conf/ucm: Remove conf files of skylake-rt286 platform

In reply to [email protected]

From: Fuwei Tang <[email protected]>

Remove conf files of skylake-rt286 platform from alsa-lib. The files will be moved to alsa-ucm-conf repo.

configure.ac +0 -1
index 71bd852..9e916d7 100644
@@ -673,7 +673,6 @@ AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \
 	  src/conf/ucm/PAZ00/Makefile \
 	  src/conf/ucm/GoogleNyan/Makefile \
 	  src/conf/ucm/broadwell-rt286/Makefile \
-	  src/conf/ucm/skylake-rt286/Makefile \
 	  src/conf/ucm/VEYRON-I2S/Makefile \
 	  src/conf/ucm/chtrt5645/Makefile \
 	  src/conf/ucm/DB410c/Makefile \
src/conf/ucm/Makefile.am +1 -1
index a11d324..7bf432e 100644
@@ -1 +1 @@
-SUBDIRS=DAISY-I2S PandaBoard PandaBoardES SDP4430 tegraalc5632 PAZ00 GoogleNyan broadwell-rt286 skylake-rt286 VEYRON-I2S chtrt5645 DB410c
+SUBDIRS=DAISY-I2S PandaBoard PandaBoardES SDP4430 tegraalc5632 PAZ00 GoogleNyan broadwell-rt286 VEYRON-I2S chtrt5645 DB410c
src/conf/ucm/skylake-rt286/Hdmi1 deleted +0 -20
deleted file mode 100644
index 0e00fc8..0000000
@@ -1,20 +0,0 @@
-# Usecase for device HDMI1/Display Port stereo playback on Intel SKYLAKE/KABYLAKE platforms
-# For Audio in I2S mode
-
-SectionDevice."Hdmi1" {
-        Comment "HDMI/Display Port 1 Stereo"
-
-        EnableSequence [
-        ]
-
-        DisableSequence [
-        ]
-
-        Value {
-                PlaybackPCM "hw:skylakert286,4"
-                PlaybackChannels "2"
-                PlaybackPriority "3"
-                JackControl "HDMI/DP, pcm=4 Jack"
-        }
-}
-
src/conf/ucm/skylake-rt286/Hdmi2 deleted +0 -20
deleted file mode 100644
index 89b31aa..0000000
@@ -1,20 +0,0 @@
-# Usecase for device HDMI2/Display Port stereo playback on Intel SKYLAKE/KABYLAKE platforms
-# For Audio in I2S mode
-
-SectionDevice."Hdmi2" {
-        Comment "HDMI/Display Port 2 Stereo"
-
-        EnableSequence [
-        ]
-
-        DisableSequence [
-        ]
-
-        Value {
-                PlaybackPCM "hw:skylakert286,5"
-                PlaybackChannels "2"
-                PlaybackPriority "4"
-                JackControl "HDMI/DP, pcm=5 Jack"
-        }
-}
-
src/conf/ucm/skylake-rt286/HiFi deleted +0 -129

129 lines not on this page · raw message

src/conf/ucm/skylake-rt286/Makefile.am deleted +0 -4
deleted file mode 100644
index 9d6a85a..0000000
@@ -1,4 +0,0 @@
-alsaconfigdir = @ALSA_CONFIG_DIR@
-ucmdir = $(alsaconfigdir)/ucm/skylake-rt286
-ucm_DATA = skylake-rt286.conf HiFi Hdmi1 Hdmi2
-EXTRA_DIST = $(ucm_DATA)
src/conf/ucm/skylake-rt286/skylake-rt286.conf deleted +0 -60

60 lines not on this page · raw message

Signature · 1 line
2.7.4
#3 lore raw
In reply to [email protected]
Quoted 6 lines · On Wed, 15 Mar 2017 07:45:38 +0100, [email protected] wrote:

From: Fuwei Tang <[email protected]>

Remove the intel UCM configs from alsa-lib repo.

Another series will add them to a dedicated UCM conf repo.

So the intention is to *move* the files to another repo, right? Removal is only one of the steps.

Quoted 1 line

License can be changed to BSD for intel files,

I couldn't find it in your next patchset. Where is BSD license defined...?

Quoted 2 lines

and left as "unknown" for other conf files when they are moved from
alsa-lib to the new repo.The alsa-lib LGPL license does not cover runtime configuration files.

It may cover, but this isn't really intended in our case. Also we have no problem regarding the authorship.
So my understanding is that it's fine to move to another repo with a declaration of a more relaxed license. But IANAL.

In anyway, the alsa-project.org site is maintained by Jaroslav, and a creation of a new git repo requires his manual action. I added him to Cc now.

thanks,

Takashi

Quoted 37 lines

Fuwei Tang (2):
conf/ucm: Remove conf files of broxton-rt298 platform conf/ucm: Remove conf files of skylake-rt286 platfrom

 configure.ac                                  |   2 -
 src/conf/ucm/Makefile.am                      |   2 +-
 src/conf/ucm/broxton-rt298/Hdmi1              |  22 -----
 src/conf/ucm/broxton-rt298/Hdmi2              |  14 ---
 src/conf/ucm/broxton-rt298/HiFi               | 129 --------------------------
 src/conf/ucm/broxton-rt298/Makefile.am        |   4 -
 src/conf/ucm/broxton-rt298/broxton-rt298.conf |  58 ------------
 src/conf/ucm/skylake-rt286/Hdmi1              |  20 ----
 src/conf/ucm/skylake-rt286/Hdmi2              |  20 ----
 src/conf/ucm/skylake-rt286/HiFi               | 129 --------------------------
 src/conf/ucm/skylake-rt286/Makefile.am        |   4 -
 src/conf/ucm/skylake-rt286/skylake-rt286.conf |  60 ------------
 12 files changed, 1 insertion(+), 463 deletions(-)
 delete mode 100644 src/conf/ucm/broxton-rt298/Hdmi1
 delete mode 100644 src/conf/ucm/broxton-rt298/Hdmi2
 delete mode 100644 src/conf/ucm/broxton-rt298/HiFi
 delete mode 100644 src/conf/ucm/broxton-rt298/Makefile.am
 delete mode 100644 src/conf/ucm/broxton-rt298/broxton-rt298.conf
 delete mode 100644 src/conf/ucm/skylake-rt286/Hdmi1
 delete mode 100644 src/conf/ucm/skylake-rt286/Hdmi2
 delete mode 100644 src/conf/ucm/skylake-rt286/HiFi
 delete mode 100644 src/conf/ucm/skylake-rt286/Makefile.am
 delete mode 100644 src/conf/ucm/skylake-rt286/skylake-rt286.conf
Signature · 6 lines
2.7.4

_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
#4 lore raw

Fuwei, I think this is your old patch version as I had similar comments last week about licence and commit message.

Quoted 12 lines · Takashi Iwai
Quoted 6 lines · On Wed, 15 Mar 2017 07:45:38 +0100, [email protected] wrote:

From: Fuwei Tang <[email protected]>

Remove the intel UCM configs from alsa-lib repo.

Another series will add them to a dedicated UCM conf repo.

So the intention is to *move* the files to another repo, right? Removal is only one of the steps.

Yes, move the Intel files under BSD license as the first step. Subsequent steps are to then move and hopefully re-license the other UCM files once author approval had been granted.

Liam

Quoted 59 lines
Quoted 1 line

License can be changed to BSD for intel files,

I couldn't find it in your next patchset. Where is BSD license defined...?

Quoted 2 lines

and left as "unknown" for other conf files when they are moved from
alsa-lib to the new repo.The alsa-lib LGPL license does not cover runtime configuration files.

It may cover, but this isn't really intended in our case. Also we have no problem regarding the authorship.
So my understanding is that it's fine to move to another repo with a declaration of a more relaxed license. But IANAL.

In anyway, the alsa-project.org site is maintained by Jaroslav, and a creation of a new git repo requires his manual action. I added him to Cc now.

thanks,

Takashi

Quoted 37 lines

Fuwei Tang (2):
conf/ucm: Remove conf files of broxton-rt298 platform conf/ucm: Remove conf files of skylake-rt286 platfrom

 configure.ac                                  |   2 -
 src/conf/ucm/Makefile.am                      |   2 +-
 src/conf/ucm/broxton-rt298/Hdmi1              |  22 -----
 src/conf/ucm/broxton-rt298/Hdmi2              |  14 ---
 src/conf/ucm/broxton-rt298/HiFi               | 129 --------------------------
 src/conf/ucm/broxton-rt298/Makefile.am        |   4 -
 src/conf/ucm/broxton-rt298/broxton-rt298.conf |  58 ------------
 src/conf/ucm/skylake-rt286/Hdmi1              |  20 ----
 src/conf/ucm/skylake-rt286/Hdmi2              |  20 ----
 src/conf/ucm/skylake-rt286/HiFi               | 129 --------------------------
 src/conf/ucm/skylake-rt286/Makefile.am        |   4 -
 src/conf/ucm/skylake-rt286/skylake-rt286.conf |  60 ------------
 12 files changed, 1 insertion(+), 463 deletions(-)
 delete mode 100644 src/conf/ucm/broxton-rt298/Hdmi1
 delete mode 100644 src/conf/ucm/broxton-rt298/Hdmi2
 delete mode 100644 src/conf/ucm/broxton-rt298/HiFi
 delete mode 100644 src/conf/ucm/broxton-rt298/Makefile.am
 delete mode 100644 src/conf/ucm/broxton-rt298/broxton-rt298.conf
 delete mode 100644 src/conf/ucm/skylake-rt286/Hdmi1
 delete mode 100644 src/conf/ucm/skylake-rt286/Hdmi2
 delete mode 100644 src/conf/ucm/skylake-rt286/HiFi
 delete mode 100644 src/conf/ucm/skylake-rt286/Makefile.am
 delete mode 100644 src/conf/ucm/skylake-rt286/skylake-rt286.conf
Signature · 6 lines
2.7.4

_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel