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 /mk/linux.mk | |
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 'mk/linux.mk')
-rw-r--r-- | mk/linux.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mk/linux.mk b/mk/linux.mk index e9d17e231..c2b226bc7 100644 --- a/mk/linux.mk +++ b/mk/linux.mk @@ -7,5 +7,5 @@ PKG_NAME:= linux PKG_VERSION:= $(KERNEL_VERSION) PKG_RELEASE:= $(KERNEL_RELEASE) PKG_MD5SUM= $(KERNEL_MD5SUM) +PKG_SITES= ${MASTER_SITE_KERNEL:=kernel/v2.6/} DISTFILES= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 -MASTER_SITES= ${MASTER_SITE_KERNEL:=kernel/v2.6/} |