diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-02 13:22:53 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-02 13:22:53 +0100 |
| commit | 34592482701199604242848b80c39bd07b6c7716 (patch) | |
| tree | 20005f94a48d069c3cfd115b1325cb44f92334fb /package | |
| parent | dfadb4d959da4c63d0c634f0d50713f3fa679e50 (diff) | |
| parent | d9a3994a44d79ed167f41db09edd0dae41566b55 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package')
| -rw-r--r-- | package/adkinstall/Makefile | 2 | ||||
| -rw-r--r-- | package/adkinstall/src/adkinstall | 6 | ||||
| -rw-r--r-- | package/busybox/Makefile | 2 | ||||
| -rw-r--r-- | package/busybox/files/watchdog.init | 4 | ||||
| -rw-r--r-- | package/watchdog/Makefile | 8 | ||||
| -rw-r--r-- | package/watchdog/files/watchdog.init | 4 |
6 files changed, 13 insertions, 13 deletions
diff --git a/package/adkinstall/Makefile b/package/adkinstall/Makefile index d4202d78a..cb2d8002c 100644 --- a/package/adkinstall/Makefile +++ b/package/adkinstall/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= adkinstall PKG_VERSION:= 1.0 -PKG_RELEASE:= 7 +PKG_RELEASE:= 8 PKG_DESCR:= openadk installer PKG_SECTION:= base PKG_DEPENDS:= parted sfdisk e2fsprogs diff --git a/package/adkinstall/src/adkinstall b/package/adkinstall/src/adkinstall index b9b0e3109..2f14d0b96 100644 --- a/package/adkinstall/src/adkinstall +++ b/package/adkinstall/src/adkinstall @@ -54,16 +54,16 @@ if [ $rescue -eq 1 ];then start=2 parted -s /dev/sda unit cyl mkpart primary ext2 0 1 check_exit - mke2fs /dev/sda1 + mke2fs -q /dev/sda1 check_exit parted -s /dev/sda unit cyl mkpart primary ext2 1 2 check_exit - mke2fs /dev/sda2 + mke2fs -q /dev/sda2 check_exit fi parted -s /dev/sda unit cyl mkpart primary ext2 $start $rootsize check_exit -mke2fs /dev/sda1 +mke2fs -q /dev/sda1 check_exit parted -s /dev/sda unit cyl mkpart primary fat32 $rootsize $maxsize check_exit diff --git a/package/busybox/Makefile b/package/busybox/Makefile index 46752cb72..6145cb780 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= busybox PKG_VERSION:= 1.18.1 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= f15fe752d8b7012aa5e59f83b88ccb1c PKG_DESCR:= Core utilities for embedded systems PKG_SECTION:= base diff --git a/package/busybox/files/watchdog.init b/package/busybox/files/watchdog.init index 5fadef046..1f1724da5 100644 --- a/package/busybox/files/watchdog.init +++ b/package/busybox/files/watchdog.init @@ -10,10 +10,10 @@ autostart) exec sh $0 start ;; start) - /usr/sbin/watchdog $watchdog_flags /dev/watchdog + /sbin/watchdog $watchdog_flags /dev/watchdog ;; stop) - kill $(pgrep -f /usr/sbin/watchdog) + kill $(pgrep -f /sbin/watchdog) ;; restart) sh $0 stop diff --git a/package/watchdog/Makefile b/package/watchdog/Makefile index b1813a044..b2c4839f7 100644 --- a/package/watchdog/Makefile +++ b/package/watchdog/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= watchdog PKG_VERSION:= 5.7 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 31766450ecfc9aff70fe966c0b9df06d PKG_DESCR:= watchdog daemon PKG_SECTION:= utils @@ -16,9 +16,9 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,WATCHDOG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) post-install: - ${INSTALL_DIR} ${IDIR_WATCHDOG}/usr/sbin ${IDIR_WATCHDOG}/etc/ + ${INSTALL_DIR} ${IDIR_WATCHDOG}/sbin ${IDIR_WATCHDOG}/etc/ ${INSTALL_DATA} ./files/watchdog.conf ${IDIR_WATCHDOG}/etc/ - ${INSTALL_BIN} ${WRKINST}/usr/sbin/watchdog \ - ${IDIR_WATCHDOG}/usr/sbin/ + ${INSTALL_BIN} ${WRKINST}/sbin/watchdog \ + ${IDIR_WATCHDOG}/sbin/ include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/watchdog/files/watchdog.init b/package/watchdog/files/watchdog.init index 6e104fbcf..60805546d 100644 --- a/package/watchdog/files/watchdog.init +++ b/package/watchdog/files/watchdog.init @@ -11,10 +11,10 @@ autostart) exec sh $0 start ;; start) - /usr/sbin/watchdog + /sbin/watchdog ;; stop) - kill $(pgrep -f /usr/sbin/watchdog) + kill $(pgrep -f /sbin/watchdog) ;; restart) sh $0 stop |