Merge branch 'master' of git+ssh://openadk.org/git/openadk

5 files changed, 14 insertions, 12 deletions

diff --git a/package/bcm2835-firmware/Makefile b/package/bcm2835-bootloader/Makefile
index a67d1a3ad..8cd28cdd3 100644
--- a/package/bcm2835-firmware/Makefile
+++ b/package/bcm2835-bootloader/Makefile
@@ -3,27 +3,28 @@
 
 include ${TOPDIR}/rules.mk
 
-PKG_NAME:=		bcm2835-firmware
+PKG_NAME:=		bcm2835-bootloader
 # actually f46e6d9cb9a6bf419fe2a428a8a586239e93aa2d from 07.01.2014
+# https://github.com/raspberrypi/firmware
 PKG_VERSION:=		0.6
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		e4c1b8f3dd13ae8742a7831c19d212b0
-PKG_DESCR:=		firmware for raspberry pi (bcm2835)
-PKG_SECTION:=		base
+PKG_MD5SUM:=		dba84ce20fc8a8c1bf473758d9350e19
+PKG_DESCR:=		bootloader for raspberry pi (bcm2835)
+PKG_SECTION:=		boot
 PKG_SITES:=		http://openadk.org/distfiles/
 
 PKG_SYSTEM_DEPENDS:=	raspberry-pi
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,BCM2835_FIRMWARE,bcm2835-firmware,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,BCM2835_BOOTLOADER,bcm2835-bootloader,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIG_STYLE:=          manual
 BUILD_STYLE:=           manual
 INSTALL_STYLE:=         manual
 
 do-install:
-	${INSTALL_DIR} ${IDIR_BCM2835_FIRMWARE}/boot
-	${CP} ${WRKBUILD}/boot/* ${IDIR_BCM2835_FIRMWARE}/boot/
+	${INSTALL_DIR} ${IDIR_BCM2835_BOOTLOADER}/boot
+	${CP} ${WRKBUILD}/boot/* ${IDIR_BCM2835_BOOTLOADER}/boot/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/cups/Makefile b/package/cups/Makefile
index f67813494..5c39f054c 100644
--- a/package/cups/Makefile
+++ b/package/cups/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		cups
 PKG_VERSION:=		1.7.1
-PKG_RELEASE:=		3
+PKG_RELEASE:=		4
 PKG_MD5SUM:=		55277c40fd4b7183dc3671d39c5c42b7
 PKG_DESCR:=		Common Unix Printing System
 PKG_SECTION:=		net/misc
@@ -48,7 +48,7 @@ HOST_CONFIGURE_ARGS+=	--disable-tcp-wrappers \
 			--with-components=core \
 			--with-rcdir=$(STAGING_HOST_DIR)/etc
 CONFIGURE_ENV+=		ac_cv_func_sigset=no \
-			OPTIM='-fPIC -std=c89'
+			OPTIM='-fPIC -std=c89' LSB_BUILD=y
 
 CONFIGURE_ARGS+=	--with-cups-user=cups \
 			--with-cups-group=cups \
diff --git a/package/grub-bin/Makefile b/package/grub-bin/Makefile
index b767e616a..7b52cdafa 100644
--- a/package/grub-bin/Makefile
+++ b/package/grub-bin/Makefile
@@ -10,7 +10,7 @@ PKG_VERSION:=		1.98
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		50dbe739776f904c318be05faf1d7ce5
 PKG_DESCR:=		GRUB2 bootloader (binary package)
-PKG_SECTION:=		base
+PKG_SECTION:=		boot
 PKG_SITES:=		http://openadk.org/distfiles/
 PKG_URL:=		http://www.gnu.org/software/grub
 
diff --git a/package/grub/Makefile b/package/grub/Makefile
index 4b429c786..cfe17a227 100644
--- a/package/grub/Makefile
+++ b/package/grub/Makefile
@@ -8,7 +8,7 @@ PKG_VERSION:=		1.98
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		c0bcf60e524739bb64e3a2d4e3732a59
 PKG_DESCR:=		GRUB2 bootloader (source package)
-PKG_SECTION:=		base
+PKG_SECTION:=		boot
 PKG_URL:=		http://www.gnu.org/software/grub
 PKG_SITES:=		ftp://alpha.gnu.org/gnu/grub/
 
diff --git a/package/section.lst b/package/section.lst
index 795840988..9476cb44d 100644
--- a/package/section.lst
+++ b/package/section.lst
@@ -1,4 +1,5 @@
 base	Base System
+boot	Boot Loaders
 browser	Browser / Editor / Pager
 editor	Browser / Editor / Pager
 pager	Browser / Editor / Pager
@@ -21,7 +22,7 @@ lang	Programming / Languages
 libs	Libraries
 mail	Mail
 misc	Misc
-multimedia	Multimedia
+multimedia	Multimedia / Audio / Video
 net	Networking
 net/fs	Network Filesystems
 net/misc	Networking Misc