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/ntp/ntp-ssl_4.1.2.bb | 2 +- packages/ntp/ntp_4.1.2.bb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'packages/ntp') diff --git a/packages/ntp/ntp-ssl_4.1.2.bb b/packages/ntp/ntp-ssl_4.1.2.bb index 937a0e20a4..fc661a240d 100644 --- a/packages/ntp/ntp-ssl_4.1.2.bb +++ b/packages/ntp/ntp-ssl_4.1.2.bb @@ -22,7 +22,7 @@ CFLAGS_append = " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED" PACKAGES = "ntpdate ntp" -FILES_ntpdate = "/usr/bin/ntpdate /etc/init.d/ntpdate" +FILES_ntpdate = "${bindir}/ntpdate /etc/init.d/ntpdate" do_install_append() { install -d ${D}/${sysconfdir}/init.d diff --git a/packages/ntp/ntp_4.1.2.bb b/packages/ntp/ntp_4.1.2.bb index 6f52699191..f77112bdfc 100644 --- a/packages/ntp/ntp_4.1.2.bb +++ b/packages/ntp/ntp_4.1.2.bb @@ -20,7 +20,7 @@ CFLAGS_append = " -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED" PACKAGES = "ntpdate ntp" -FILES_ntpdate = "/usr/bin/ntpdate /etc/init.d/ntpdate" +FILES_ntpdate = "${bindir}/ntpdate /etc/init.d/ntpdate" do_install_append() { install -d ${D}/${sysconfdir}/init.d @@ -34,7 +34,7 @@ else if ! grep -q ntpdate /etc/cron/crontabs/root; then echo "adding crontab" test -d /etc/cron/crontabs || mkdir -p /etc/cron/crontabs - echo "30 * * * * /usr/bin/ntpdate -s -u pool.ntp.org" >> /etc/cron/crontabs/root + echo "30 * * * * ${bindir}/ntpdate -s -u pool.ntp.org" >> /etc/cron/crontabs/root fi update-rc.d -s busybox-cron defaults update-rc.d -s ntpdate defaults 30 -- cgit v1.2.3