From 7297ef1c47935fb17e49cac8379908e631763566 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 13 Apr 2014 17:06:21 +0200 Subject: use -O0 when debug on --- package/ffmpeg/Makefile | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'package') diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile index 6a3f60fdd..838ed551d 100644 --- a/package/ffmpeg/Makefile +++ b/package/ffmpeg/Makefile @@ -100,7 +100,11 @@ $(eval $(call PKG_template,FFSERVER,ffserver,${PKG_VERSION}-${PKG_RELEASE},${PKG $(eval $(call PKG_template,FFPROBE,ffprobe,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FFPROBE},${PKGSC_FFPROBE})) #$(eval $(call PKG_template,FFPLAY,ffplay,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_FFPLAY},${PKGSD_FFPLAY},${PKGSC_FFPLAY})) +ifeq ($(ADK_DEBUG),y) +TARGET_CFLAGS:= $(subst O0,O2,$(TARGET_CFLAGS)) +else TARGET_CFLAGS:= $(subst Os,O2,$(TARGET_CFLAGS)) +endif TARGET_CPPFLAGS+= -D_POSIX_SOURCE -D_GNU_SOURCE ifeq ($(ADK_TARGET_CPU_WITH_MMX),y) -- cgit v1.2.3 From 36841087cc538f25c9791b0191766780842f1003 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 13 Apr 2014 20:56:05 +0200 Subject: add example embed.cfg --- package/grub/files/embed.cfg | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 package/grub/files/embed.cfg (limited to 'package') diff --git a/package/grub/files/embed.cfg b/package/grub/files/embed.cfg new file mode 100644 index 000000000..01eb1d453 --- /dev/null +++ b/package/grub/files/embed.cfg @@ -0,0 +1,2 @@ +set root=(hd0,1) +set prefix=($root)/boot/grub -- cgit v1.2.3 From 599982c916530310b29f609f44d10cd5a6b381a4 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 13 Apr 2014 22:14:31 +0200 Subject: add pregenerated core.img, there is no portable way to do it right now --- package/grub-bin/Makefile | 33 --------------------------------- package/grub/Makefile | 26 ++++++++++++++++++-------- package/grub/files/core.img.i386-pc | Bin 0 -> 25564 bytes 3 files changed, 18 insertions(+), 41 deletions(-) delete mode 100644 package/grub-bin/Makefile create mode 100644 package/grub/files/core.img.i386-pc (limited to 'package') diff --git a/package/grub-bin/Makefile b/package/grub-bin/Makefile deleted file mode 100644 index 352c2b572..000000000 --- a/package/grub-bin/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# 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 - -# compiled with i486 toolchain, statically linked with uClibc -# cross-compiling is difficult, so provide a binary package -PKG_NAME:= grub-bin -PKG_VERSION:= 1.98 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 50dbe739776f904c318be05faf1d7ce5 -PKG_DESCR:= GRUB2 bootloader (binary package) -PKG_SECTION:= boot -PKG_SITES:= http://openadk.org/distfiles/ -PKG_URL:= http://www.gnu.org/software/grub - -PKG_ARCH_DEPENDS:= x86 x86_64 - -PKG_CFLINE_GRUB_BIN:= select BUSYBOX_FEATURE_STAT_FORMAT@ -PKG_CFLINE_GRUB_BIN+= depends on !ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK && !ADK_TARGET_ROOTFS_INITRAMFS - -include ${TOPDIR}/mk/package.mk - -$(eval $(call PKG_template,GRUB_BIN,grub-bin,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -CONFIG_STYLE:= manual -BUILD_STYLE:= manual -INSTALL_STYLE:= manual - -do-install: - ${CP} ${WRKBUILD}/* ${IDIR_GRUB_BIN}/ - -include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/grub/Makefile b/package/grub/Makefile index 2f2deba4a..e52980ce4 100644 --- a/package/grub/Makefile +++ b/package/grub/Makefile @@ -5,9 +5,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= grub PKG_VERSION:= 2.00 -PKG_RELEASE:= 4 +PKG_RELEASE:= 5 PKG_MD5SUM:= e927540b6eda8b024fb0391eeaa4091c -PKG_DESCR:= GRUB2 bootloader (source package) +PKG_DESCR:= GRUB2 bootloader PKG_SECTION:= boot PKG_BUILDDEP:= bison-host qemu-host PKG_URL:= http://www.gnu.org/software/grub @@ -16,6 +16,8 @@ PKG_SITES:= ftp://ftp.gnu.org/gnu/grub/ PKG_ARCH_DEPENDS:= x86 x86_64 mips PKG_NOPARALLEL:= 1 +PKG_SUBPKGS:= GRUB GRUB_TOOLS + PKG_CHOICES_GRUB:= PC EFI PKGCD_PC:= build for PC BIOS PKGCD_EFI:= build for EFI @@ -23,7 +25,10 @@ PKGCD_EFI:= build for EFI include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,GRUB,grub,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,GRUB_TOOLS,grub-tools,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +# core.img is generated via +# grub-mkimage -O ${GRUB_ARCH} -o core.img -c embed.cfg ${GRUB_MODULES} GRUB_MODULES:= ext2 part_msdos biosdisk ifeq ($(ADK_PACKAGE_GRUB_PC),y) @@ -35,11 +40,8 @@ GRUB_ARCH:= x86_64-efi CONFIGURE_ARGS+= --with-platform=efi endif -TARGET_CFLAGS+= -static -TARGET_LDFLAGS+= -static CONFIGURE_ARGS+= --disable-grub-mkfont \ --enable-efiemu=no \ - --enable-liblzma=no \ --enable-device-mapper=no \ --enable-libzfs=no \ --disable-werror @@ -49,8 +51,16 @@ grub-install: ${INSTALL_DIR} $(IDIR_GRUB)/boot/grub/${GRUB_ARCH} ${CP} ${WRKINST}/usr/lib/grub/${GRUB_ARCH}/*{mod,lst,img} \ $(IDIR_GRUB)/boot/grub/${GRUB_ARCH}/ - PATH='${HOST_PATH}' qemu-i386 ${WRKBUILD}/grub-mkimage \ - -o $(IDIR_GRUB)/boot/grub/core.img -O ${GRUB_ARCH} \ - -c ./files/embed.cfg ${GRUB_MODULES} + ${CP} ./files/core.img.${GRUB_ARCH} \ + $(IDIR_GRUB)/boot/grub/core.img + +grub-tools-install: + ${INSTALL_DIR} $(IDIR_GRUB_TOOLS)/usr/{sbin,bin} + ${INSTALL_BIN} ${WRKINST}/usr/sbin/grub-install \ + $(IDIR_GRUB_TOOLS)/usr/sbin + ${INSTALL_BIN} ${WRKINST}/usr/sbin/grub-bios-setup \ + $(IDIR_GRUB_TOOLS)/usr/sbin + ${INSTALL_BIN} ${WRKINST}/usr/bin/grub-mkimage \ + $(IDIR_GRUB_TOOLS)/usr/bin include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/grub/files/core.img.i386-pc b/package/grub/files/core.img.i386-pc new file mode 100644 index 000000000..bd6fbac6f Binary files /dev/null and b/package/grub/files/core.img.i386-pc differ -- cgit v1.2.3 From a01308335cf58e80e53d6932df9458630c9554b8 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 13 Apr 2014 22:39:37 +0200 Subject: fix postinst script --- package/busybox/files/busybox.postinst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package') diff --git a/package/busybox/files/busybox.postinst b/package/busybox/files/busybox.postinst index d403ff481..ed264244f 100644 --- a/package/busybox/files/busybox.postinst +++ b/package/busybox/files/busybox.postinst @@ -5,7 +5,7 @@ add_rcconf network network YES add_rcconf crond crond NO add_rcconf watchdog watchdog NO add_rcconf watchdog_flags watchdog_flags '-t 10 -T 20' -add_rcconf syslogd NO +add_rcconf syslogd syslogd NO add_rcconf 'use "-C32" normally' syslogd_flags '-C32' add_rcconf inetd inetd NO add_rcconf ntpd ntpd NO -- cgit v1.2.3 From 6f03e0cd975351c065d44fad8bc54b578a9c502e Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 14 Apr 2014 09:26:06 +0200 Subject: add serial command line flag --- package/grub/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'package') diff --git a/package/grub/Makefile b/package/grub/Makefile index e52980ce4..9e43242aa 100644 --- a/package/grub/Makefile +++ b/package/grub/Makefile @@ -17,6 +17,7 @@ PKG_ARCH_DEPENDS:= x86 x86_64 mips PKG_NOPARALLEL:= 1 PKG_SUBPKGS:= GRUB GRUB_TOOLS +PKGSD_GRUB_TOOLS:= GRUB2 tools PKG_CHOICES_GRUB:= PC EFI PKGCD_PC:= build for PC BIOS -- cgit v1.2.3 From 7209a2a3b092d9964a8c8aa48d2b8d1d42d41738 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 14 Apr 2014 14:39:11 +0200 Subject: compile patch when not available on Host --- package/patch/Makefile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'package') diff --git a/package/patch/Makefile b/package/patch/Makefile index 0d80e53ec..0d1e23448 100644 --- a/package/patch/Makefile +++ b/package/patch/Makefile @@ -4,20 +4,25 @@ include $(TOPDIR)/rules.mk PKG_NAME:= patch -PKG_VERSION:= 2.5.9 +PKG_VERSION:= 2.7.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= dacfb618082f8d3a2194601193cf8716 -PKG_DESCR:= GNU patch +PKG_MD5SUM:= 95dd8d7e41dcbcecdd5cd88ef915378d +PKG_DESCR:= GNU patch utility PKG_SECTION:= utils PKG_URL:= http://www.gnu.org/software/patch/ PKG_SITES:= ${MASTER_SITE_GNU:=patch/} +include $(TOPDIR)/mk/host.mk include $(TOPDIR)/mk/package.mk +$(eval $(call HOST_template,PATCH,patch,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,PATCH,patch,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +HOST_STYLE:= auto + patch-install: $(INSTALL_DIR) $(IDIR_PATCH)/usr/bin $(INSTALL_BIN) $(WRKINST)/usr/bin/patch $(IDIR_PATCH)/usr/bin +include ${TOPDIR}/mk/host-bottom.mk include ${TOPDIR}/mk/pkg-bottom.mk -- cgit v1.2.3 From 7c7cd30c44da0ca33ac86eeed01d7e9522b0c93a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 14 Apr 2014 14:53:31 +0200 Subject: add host build deps --- package/bc/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'package') diff --git a/package/bc/Makefile b/package/bc/Makefile index d35659ed8..ee8a52f91 100644 --- a/package/bc/Makefile +++ b/package/bc/Makefile @@ -10,6 +10,7 @@ PKG_MD5SUM:= d44b5dddebd8a7a7309aea6c36fda117 PKG_DESCR:= arbitrary precision calculator language PKG_SECTION:= utils PKG_BUILDDEP:= m4-host flex-host +HOST_BUILDDEP:= m4-host flex-host PKG_URL:= http://www.gnu.org/software/bc/ PKG_SITES:= http://ftp.gnu.org/pub/gnu/bc/ -- cgit v1.2.3