diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/hdparm | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/hdparm')
| -rw-r--r-- | package/hdparm/Makefile | 11 | ||||
| -rw-r--r-- | package/hdparm/ipkg/hdparm.control | 4 |
2 files changed, 7 insertions, 8 deletions
diff --git a/package/hdparm/Makefile b/package/hdparm/Makefile index c9b476d12..4824f2ab5 100644 --- a/package/hdparm/Makefile +++ b/package/hdparm/Makefile @@ -6,14 +6,17 @@ include ${TOPDIR}/rules.mk PKG_NAME:= hdparm -PKG_VERSION:= 6.6 +PKG_VERSION:= 9.15 PKG_RELEASE:= 1 -PKG_MD5SUM:= ecea69f775396e4ab6112dcf9066239f -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=hdparm/} +PKG_MD5SUM:= 0524dd10ad986285ff4eeb3507f7471c +PKG_DESCR:= get/set ATA drive parameters +PKG_SECTION:= misc +PKG_URL:= http://sourceforge.net/projects/hdparm +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=hdparm/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,HDPARM,hdparm,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,HDPARM,hdparm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) BUILD_STYLE= auto diff --git a/package/hdparm/ipkg/hdparm.control b/package/hdparm/ipkg/hdparm.control deleted file mode 100644 index 4db1002d1..000000000 --- a/package/hdparm/ipkg/hdparm.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: hdparm -Priority: optional -Section: misc -Description: get/set ATA drive parameters |