From 4f857db335de6935077d4866c51dd9d6851fed1d Mon Sep 17 00:00:00 2001 From: "nslu2-linux.adm@bkbits.net" Date: Tue, 22 Feb 2005 12:53:55 +0000 Subject: 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 --- packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.1.bb | 4 ++-- packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.4.bb | 4 ++-- packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.5.bb | 4 ++-- packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.12.bb | 4 ++-- packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.1.bb | 4 ++-- packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.bb | 4 ++-- packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) (limited to 'packages/linux') diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.1.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.1.bb index 03149b10f4..3238f1d96b 100644 --- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.1.bb +++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.1.bb @@ -60,6 +60,6 @@ do_configure_prepend() { } do_install_append() { - install -d ${D}/etc/init.d - install ${WORKDIR}/ipaq-hal.init ${D}/etc/init.d/ipaq-hal + install -d ${D}/${sysconfdir}/init.d + install ${WORKDIR}/ipaq-hal.init ${D}/${sysconfdir}/init.d/ipaq-hal } diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.4.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.4.bb index 2a3b86a6cd..e808cecbee 100644 --- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.4.bb +++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.4.bb @@ -63,6 +63,6 @@ do_configure_prepend() { } do_install_append() { - install -d ${D}/etc/init.d - install ${WORKDIR}/ipaq-hal.init ${D}/etc/init.d/ipaq-hal + install -d ${D}/${sysconfdir}/init.d + install ${WORKDIR}/ipaq-hal.init ${D}/${sysconfdir}/init.d/ipaq-hal } diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.5.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.5.bb index 9e3b387401..bc9982374c 100644 --- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.5.bb +++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.5.bb @@ -62,6 +62,6 @@ do_configure_prepend() { } do_install_append() { - install -d ${D}/etc/init.d - install ${WORKDIR}/ipaq-hal.init ${D}/etc/init.d/ipaq-hal + install -d ${D}/${sysconfdir}/init.d + install ${WORKDIR}/ipaq-hal.init ${D}/${sysconfdir}/init.d/ipaq-hal } diff --git a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.12.bb b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.12.bb index a3d9af9268..e0af79d39a 100644 --- a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.12.bb +++ b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.12.bb @@ -53,6 +53,6 @@ do_configure_prepend() { } do_install_append() { - install -d ${D}/etc/init.d - install ${WORKDIR}/ipaq-hal.init ${D}/etc/init.d/ipaq-hal + install -d ${D}/${sysconfdir}/init.d + install ${WORKDIR}/ipaq-hal.init ${D}/${sysconfdir}/init.d/ipaq-hal } diff --git a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.1.bb b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.1.bb index 3984a65a9c..3d9029b73b 100644 --- a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.1.bb +++ b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.1.bb @@ -52,6 +52,6 @@ do_configure_prepend() { } do_install_append() { - install -d ${D}/etc/init.d - install ${WORKDIR}/ipaq-hal.init ${D}/etc/init.d/ipaq-hal + install -d ${D}/${sysconfdir}/init.d + install ${WORKDIR}/ipaq-hal.init ${D}/${sysconfdir}/init.d/ipaq-hal } diff --git a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.bb b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.bb index a29541a766..6cc5e1a023 100644 --- a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.bb +++ b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.bb @@ -50,6 +50,6 @@ do_configure_prepend() { } do_install_append() { - install -d ${D}/etc/init.d - install ${WORKDIR}/ipaq-hal.init ${D}/etc/init.d/ipaq-hal + install -d ${D}/${sysconfdir}/init.d + install ${WORKDIR}/ipaq-hal.init ${D}/${sysconfdir}/init.d/ipaq-hal } diff --git a/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb b/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb index 4b3169b80d..7e14473036 100644 --- a/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb +++ b/packages/linux/mnci-ramses_2.4.21-rmk2-pxa1.bb @@ -61,5 +61,5 @@ kernel_do_install() { install -d ${D}/boot install -m 0644 .config ${D}/boot/config-${PV} bzip2 -9 ${D}/boot/* - install -d ${D}/etc/modutils + install -d ${D}/${sysconfdir}/modutils } -- cgit v1.2.3