diff options
| author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-02-22 12:53:55 +0000 |
|---|---|---|
| committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-02-22 12:53:55 +0000 |
| commit | 4f857db335de6935077d4866c51dd9d6851fed1d (patch) | |
| tree | 1c923be071d1a56bd79f467fd75ac77959a493a3 /packages/gpe-session-scripts | |
| parent | b32403d57d7e0473dd336e76f95c7b26f113cf26 (diff) | |
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/02/21 17:35:27-06:00 ti.com!kergoth
Kill the ipkg paths patch, since its busted.
2005/02/21 17:33:13-06:00 ti.com!kergoth
Fix sbindir in native.bbclass and cross.bbclass. Thanks to Jordan Crouse for reporting.
2005/02/21 17:13:19-06:00 ti.com!kergoth
Add the paths patch to ipkg which fixes it to no longer hardcode the '/usr/lib/ipkg' path, which I forgot to check in from the previous commit.
2005/02/21 17:09:46-06:00 ti.com!kergoth
Merge oe-devel@oe-devel.bkbits.net:openembedded
into odin.sc.ti.com:/home/kergoth/code/user/oe/openembedded
2005/02/21 17:09:03-06:00 ti.com!kergoth
Run a sed script against our packages to fix some hardcoded target path
references. As always when I do things like this, if packages you maintain
were touched by this, please do a sanity check to ensure the sed script didn't
run wild.
2005/02/21 15:49:47-06:00 ti.com!kergoth
Use a HOTPLUG variable to manage which hotplug you prefer, to ensure that hotplug is still included in task-bootstrap even if you dont set DISTRO.
BKrev: 421b2b63X5eoMcSrC7pVcptXK-iFKg
Diffstat (limited to 'packages/gpe-session-scripts')
| -rw-r--r-- | packages/gpe-session-scripts/gpe-session-scripts_0.61.bb | 4 | ||||
| -rw-r--r-- | packages/gpe-session-scripts/gpe-session-scripts_0.62.bb | 18 |
2 files changed, 11 insertions, 11 deletions
diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.61.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.61.bb index a2463753bb..ef503e4dde 100644 --- a/packages/gpe-session-scripts/gpe-session-scripts_0.61.bb +++ b/packages/gpe-session-scripts/gpe-session-scripts_0.61.bb @@ -14,9 +14,9 @@ DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth xstroke xtscal gpe-question SRC_URI += "file://change-default-applets.patch;patch=1" do_install_append() { - install -d ${D}/etc/gpe/xsettings-default.d + install -d ${D}/${sysconfdir}/gpe/xsettings-default.d if [ "${GUI_MACHINE_CLASS}" != "bigscreen" ]; then - echo "Gtk/ToolbarStyle:S:icons" > ${D}/etc/gpe/xsettings-default.d/toolbar + echo "Gtk/ToolbarStyle:S:icons" > ${D}/${sysconfdir}/gpe/xsettings-default.d/toolbar fi } diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.62.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.62.bb index df14b2baf3..0dacd7a7de 100644 --- a/packages/gpe-session-scripts/gpe-session-scripts_0.62.bb +++ b/packages/gpe-session-scripts/gpe-session-scripts_0.62.bb @@ -21,20 +21,20 @@ SRC_URI += "file://zaurus.sh \ file://disable-composite.xsettings" do_install_append() { - install ${WORKDIR}/zaurus.sh ${D}/etc/X11/Xinit.d/11zaurus - install ${WORKDIR}/keymap.sh ${D}/etc/X11/Xinit.d/12keymap + install ${WORKDIR}/zaurus.sh ${D}/${sysconfdir}/X11/Xinit.d/11zaurus + install ${WORKDIR}/keymap.sh ${D}/${sysconfdir}/X11/Xinit.d/12keymap for m in simpad shepherd collie; do - install -m 0644 ${WORKDIR}/$m.xmodmap ${D}/etc/X11/ + install -m 0644 ${WORKDIR}/$m.xmodmap ${D}/${sysconfdir}/X11/ done - install -d ${D}/etc/gpe/xsettings-default.d + install -d ${D}/${sysconfdir}/gpe/xsettings-default.d if [ "${GUI_MACHINE_CLASS}" != "bigscreen" ]; then - echo "Gtk/ToolbarStyle:S:icons" > ${D}/etc/gpe/xsettings-default.d/toolbar + echo "Gtk/ToolbarStyle:S:icons" > ${D}/${sysconfdir}/gpe/xsettings-default.d/toolbar fi - install -d ${D}/etc/matchbox - install ${WORKDIR}/matchbox-session ${D}/etc/matchbox/session + install -d ${D}/${sysconfdir}/matchbox + install ${WORKDIR}/matchbox-session ${D}/${sysconfdir}/matchbox/session - install -d ${D}/etc/gpe/xsettings-default.d - install -m 0644 ${WORKDIR}/disable-composite.xsettings ${D}/etc/gpe/xsettings-default.d/disable-composite + install -d ${D}/${sysconfdir}/gpe/xsettings-default.d + install -m 0644 ${WORKDIR}/disable-composite.xsettings ${D}/${sysconfdir}/gpe/xsettings-default.d/disable-composite } # This makes use of GUI_MACHINE_CLASS, so set PACKAGE_ARCH appropriately |