git.openpandora.org
/
openpandora.oe.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2b188ce
)
pandora-skel: clean up modutils files
author
Grazvydas Ignotas
<notasas@gmail.com>
Wed, 8 Jul 2015 22:01:14 +0000
(
01:01
+0300)
committer
Grazvydas Ignotas
<notasas@gmail.com>
Wed, 8 Jul 2015 22:01:14 +0000
(
01:01
+0300)
recipes/pandora-system/pandora-first-run-wizard/first-run-wizard.sh
patch
|
blob
|
history
recipes/pandora-system/pandora-skel.bb
patch
|
blob
|
history
recipes/pandora-system/pandora-skel/fuse
[deleted file]
patch
|
blob
|
history
recipes/pandora-system/pandora-skel/snd-pcm-oss
[deleted file]
patch
|
blob
|
history
diff --git
a/recipes/pandora-system/pandora-first-run-wizard/first-run-wizard.sh
b/recipes/pandora-system/pandora-first-run-wizard/first-run-wizard.sh
index
4cfad91
..
5b18906
100755
(executable)
--- a/
recipes/pandora-system/pandora-first-run-wizard/first-run-wizard.sh
+++ b/
recipes/pandora-system/pandora-first-run-wizard/first-run-wizard.sh
@@
-338,13
+338,11
@@
if ! grep -q 'blacklist rtl8192cu' /etc/modprobe.conf 2> /dev/null; then
echo 'blacklist rtl8192cu' >> /etc/modprobe.conf
fi
echo 'blacklist rtl8192cu' >> /etc/modprobe.conf
fi
-# add Midi module
-echo snd-seq > /etc/modutils/snd-seq
+# add Midi module
- handled in pandora-skel.bb
+
#
echo snd-seq > /etc/modutils/snd-seq
# zram doesn't seem to help, disabled
# echo zram > /etc/modutils/zram
# zram doesn't seem to help, disabled
# echo zram > /etc/modutils/zram
-/usr/sbin/update-modules
-
# get rid of some dirs in /media that OE creates but are unlikely to be used
rmdir /media/card /media/cf /media/mmc1 /media/net /media/realroot /media/union 2> /dev/null
# get rid of some dirs in /media that OE creates but are unlikely to be used
rmdir /media/card /media/cf /media/mmc1 /media/net /media/realroot /media/union 2> /dev/null
diff --git
a/recipes/pandora-system/pandora-skel.bb
b/recipes/pandora-system/pandora-skel.bb
index
710750c
..
3e38a2c
100644
(file)
--- a/
recipes/pandora-system/pandora-skel.bb
+++ b/
recipes/pandora-system/pandora-skel.bb
@@
-5,7
+5,7
@@
COMPATIBLE_MACHINE = "omap3-pandora"
# /etc/skel is used by Shadow's useradd so you really have that installed for this to make sense ;)
RDEPENDS = "shadow"
# /etc/skel is used by Shadow's useradd so you really have that installed for this to make sense ;)
RDEPENDS = "shadow"
-PR = "r3
0
"
+PR = "r3
1
"
SRC_URI = " \
file://.xinitrc \
SRC_URI = " \
file://.xinitrc \
@@
-17,9
+17,7
@@
SRC_URI = " \
file://pndXmodmap \
# file://asoundrc \
file://vimrc \
file://pndXmodmap \
# file://asoundrc \
file://vimrc \
- file://fuse \
file://ntpdate.sh \
file://ntpdate.sh \
- file://snd-pcm-oss \
# file://op_btenabled \
file://PandoraQuickStart.pdf \
file://PandoraQuickStart.desktop \
# file://op_btenabled \
file://PandoraQuickStart.pdf \
file://PandoraQuickStart.desktop \
@@
-45,13
+43,19
@@
do_install() {
install -m 0644 ${WORKDIR}/pndXmodmap ${D}${sysconfdir}/skel/.pndXmodmap
# install -m 0644 ${WORKDIR}/asoundrc ${D}${sysconfdir}/skel/.asoundrc
install -m 0644 ${WORKDIR}/gtkrc-2.0 ${D}${sysconfdir}/skel/.gtkrc-2.0
install -m 0644 ${WORKDIR}/pndXmodmap ${D}${sysconfdir}/skel/.pndXmodmap
# install -m 0644 ${WORKDIR}/asoundrc ${D}${sysconfdir}/skel/.asoundrc
install -m 0644 ${WORKDIR}/gtkrc-2.0 ${D}${sysconfdir}/skel/.gtkrc-2.0
- install -m 0644 ${WORKDIR}/fuse ${D}${sysconfdir}/modutils/fuse
- install -m 0644 ${WORKDIR}/snd-pcm-oss ${D}${sysconfdir}/modutils/snd-pcm-oss
# install -m 0644 ${WORKDIR}/op_btenabled ${D}${sysconfdir}/skel/.op_btenabled
install -m 0755 ${WORKDIR}/PandoraQuickStart.desktop ${D}${sysconfdir}/skel/Desktop/PandoraQuickStart.desktop
install -m 0755 ${WORKDIR}/GetPNDManager.desktop ${D}${sysconfdir}/skel/Desktop/GetPNDManager.desktop
install -m 0755 ${WORKDIR}/PandoraQuickStart.pdf ${D}${sysconfdir}/pandora/PandoraQuickStart.pdf
# install -m 0644 ${WORKDIR}/op_btenabled ${D}${sysconfdir}/skel/.op_btenabled
install -m 0755 ${WORKDIR}/PandoraQuickStart.desktop ${D}${sysconfdir}/skel/Desktop/PandoraQuickStart.desktop
install -m 0755 ${WORKDIR}/GetPNDManager.desktop ${D}${sysconfdir}/skel/Desktop/GetPNDManager.desktop
install -m 0755 ${WORKDIR}/PandoraQuickStart.pdf ${D}${sysconfdir}/pandora/PandoraQuickStart.pdf
-
+
+ # modules to be autoloaded
+ echo fuse > ${WORKDIR}/fuse
+ install -m 0644 ${WORKDIR}/fuse ${D}${sysconfdir}/modutils/fuse
+ echo snd-pcm-oss > ${WORKDIR}/snd-pcm-oss
+ install -m 0644 ${WORKDIR}/snd-pcm-oss ${D}${sysconfdir}/modutils/snd-pcm-oss
+ echo snd-seq > ${WORKDIR}/snd-seq
+ install -m 0644 ${WORKDIR}/snd-seq ${D}${sysconfdir}/modutils/snd-seq
+
install -d ${D}${sysconfdir}/skel/Applications/Settings/xfce4/xfconf/xfce-perchannel-xml
install -m 0644 ${WORKDIR}/xsettings.xml ${D}${sysconfdir}/skel/Applications/Settings/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
install -d ${D}${sysconfdir}/skel/Applications/Settings/xfce4/xfconf/xfce-perchannel-xml
install -m 0644 ${WORKDIR}/xsettings.xml ${D}${sysconfdir}/skel/Applications/Settings/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
@@
-59,6
+63,14
@@
do_install() {
install -m 0644 ${WORKDIR}/mplayconfig ${D}${sysconfdir}/skel/.mplayer/config
}
install -m 0644 ${WORKDIR}/mplayconfig ${D}${sysconfdir}/skel/.mplayer/config
}
+pkg_postinst () {
+ update-modules
+}
+
+pkg_postrm () {
+ update-modules
+}
+
PACKAGE_ARCH = "${MACHINE_ARCH}"
FILES_${PN} = "/*"
PACKAGE_ARCH = "${MACHINE_ARCH}"
FILES_${PN} = "/*"
diff --git
a/recipes/pandora-system/pandora-skel/fuse
b/recipes/pandora-system/pandora-skel/fuse
deleted file mode 100644
(file)
index
df5bd8d
..0000000
--- a/
recipes/pandora-system/pandora-skel/fuse
+++ /dev/null
@@
-1
+0,0 @@
-fuse
diff --git
a/recipes/pandora-system/pandora-skel/snd-pcm-oss
b/recipes/pandora-system/pandora-skel/snd-pcm-oss
deleted file mode 100644
(file)
index
a36c50c
..0000000
--- a/
recipes/pandora-system/pandora-skel/snd-pcm-oss
+++ /dev/null
@@
-1
+0,0 @@
-snd-pcm-oss