diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-09-10 21:59:08 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-09-10 21:59:08 +0200 |
| commit | 70467235e8f54f04f6d9b0e81cfef35794fdc4c0 (patch) | |
| tree | 0f46cc27f31b87ea8049a4b902841660cef06773 /package | |
| parent | d9ff60dad6c5f68824c481a2bb698d6941d0255b (diff) | |
| parent | 4c8e9488814c0add98a02776499999e4e23bf507 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package')
| -rw-r--r-- | package/Config.in | 1 | ||||
| -rw-r--r-- | package/Makefile | 1 | ||||
| -rw-r--r-- | package/busybox/config/coreutils/Config.in | 2 | ||||
| -rw-r--r-- | package/grub-bin/Config.in | 8 | ||||
| -rw-r--r-- | package/grub-bin/Makefile | 23 | ||||
| -rw-r--r-- | package/rpm/Config.in | 2 |
6 files changed, 35 insertions, 2 deletions
diff --git a/package/Config.in b/package/Config.in index 6fef6b82c..d3d76d756 100644 --- a/package/Config.in +++ b/package/Config.in @@ -15,6 +15,7 @@ source "package/glibc/Config.in" source "package/eglibc/Config.in" source "package/libc/Config.in" source "package/rpm/Config.in" +source "package/grub-bin/Config.in" endmenu menu "Bluetooth" diff --git a/package/Makefile b/package/Makefile index f8fca7505..37dc534c5 100644 --- a/package/Makefile +++ b/package/Makefile @@ -132,6 +132,7 @@ package-$(ADK_PACKAGE_GPERF) += gperf package-$(ADK_PACKAGE_GPG) += gpg package-$(ADK_PACKAGE_GPM) += gpm package-$(ADK_PACKAGE_GPSD) += gpsd +package-$(ADK_PACKAGE_GRUB_BIN) += grub-bin package-$(ADK_COMPILE_GSM) += gsm package-$(ADK_PACKAGE_HASERL) += haserl package-$(ADK_PACKAGE_HDPARM) += hdparm diff --git a/package/busybox/config/coreutils/Config.in b/package/busybox/config/coreutils/Config.in index cd7a14083..e0342efc8 100644 --- a/package/busybox/config/coreutils/Config.in +++ b/package/busybox/config/coreutils/Config.in @@ -572,7 +572,7 @@ config BUSYBOX_FEATURE_SPLIT_FANCY config BUSYBOX_STAT bool "stat" - default n + default y help display file or filesystem status. diff --git a/package/grub-bin/Config.in b/package/grub-bin/Config.in new file mode 100644 index 000000000..bb2d85550 --- /dev/null +++ b/package/grub-bin/Config.in @@ -0,0 +1,8 @@ +config ADK_PACKAGE_GRUB_BIN + prompt "grub-bin............................. GRUB 2 bootloader (binary)" + tristate + depends on ADK_LINUX_X86_64_SHUTTLE + select BUSYBOX_FEATURE_STAT_FORMAT + default y if ADK_LINUX_X86_64_SHUTTLE + help + diff --git a/package/grub-bin/Makefile b/package/grub-bin/Makefile new file mode 100644 index 000000000..6e0a42817 --- /dev/null +++ b/package/grub-bin/Makefile @@ -0,0 +1,23 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include ${TOPDIR}/rules.mk + +PKG_NAME:= grub-bin +PKG_VERSION:= 1.97 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 0b975ea2f0c0cbad6a130d4614fbf399 +PKG_DESCR:= GRUB bootloader +PKG_SECTION:= sys +PKG_SITES:= http://openadk.org/distfiles/ + +include ${TOPDIR}/mk/package.mk + +$(eval $(call PKG_template,GRUB_BIN,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +INSTALL_STYLE= manual + +do-install: + ${CP} ${WRKBUILD}/* ${IDIR_GRUB_BIN}/ + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/rpm/Config.in b/package/rpm/Config.in index c84884a08..dbb227eed 100644 --- a/package/rpm/Config.in +++ b/package/rpm/Config.in @@ -1,5 +1,5 @@ config ADK_PACKAGE_RPM - prompt "rpm............................... Red Hat package manager" + prompt "rpm.................................. Red Hat package manager" tristate depends on ADK_CXX select ADK_PACKAGE_NSS |