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

package/dillo/Makefile

@@ -5,13 +5,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		dillo
 PKG_VERSION:=		3.0.3
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		726cd0b7a18c5e25f4d80ebeffe7607e
 PKG_DESCR:=		small graphical web browser
 PKG_SECTION:=		x11/apps
 PKG_DEPENDS:=		libfltk libxi libiconv libpng zlib libjpeg
-PKG_DEPENDS+=		libstdcxx libpthread libgcc
-PKG_BUILDDEP:=		fltk libXi libiconv jpeg libpng zlib
+PKG_DEPENDS+=		libstdcxx libpthread libgcc libopenssl
+PKG_BUILDDEP:=		fltk libXi libiconv jpeg libpng zlib openssl
 PKG_URL:=		http://www.dillo.org/
 PKG_SITES:=		http://www.dillo.org/download/
 PKG_NEED_CXX:=		1
@@ -28,10 +28,14 @@ $(eval $(call PKG_template,DILLO,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG
 CONFIGURE_ENV+=		PNG_CONFIG=$(STAGING_DIR)/usr/bin/png-config
 TARGET_LDFLAGS+=	-liconv -lpng15
 XAKE_FLAGS+=		GCC_HONOUR_COPTS=s
+CONFIGURE_ARGS+=	--enable-ssl
 
 post-install:
-	$(INSTALL_DIR) $(IDIR_DILLO)/usr/bin
+	$(INSTALL_DIR) $(IDIR_DILLO)/etc/dillo
+	$(INSTALL_DATA) $(WRKINST)/etc/dillo/* $(IDIR_DILLO)/etc/dillo
+	$(INSTALL_DIR) $(IDIR_DILLO)/usr/bin $(IDIR_DILLO)/usr/lib/dillo
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/dillo $(IDIR_DILLO)/usr/bin
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/dpid* $(IDIR_DILLO)/usr/bin
+	$(CP) $(WRKINST)/usr/lib/dillo/* $(IDIR_DILLO)/usr/lib/dillo
 
 include ${TOPDIR}/mk/pkg-bottom.mk

package/samba/files/smb.conf

@@ -1,6 +1,7 @@
 [global]
  syslog = 1
  syslog only = yes
+ log level = 1
  workgroup = OpenADK
  server string = OpenADK Samba Server
  security = user
@@ -20,3 +21,4 @@
 # comment = Media files
 # read only = yes
 # guest ok = yes
+# path = /media

target/linux/config/Config.in.block

@@ -177,6 +177,7 @@ config ADK_KERNEL_ATA_PIIX
 	select ADK_KERNEL_ATA_BMDMA
 	select ADK_KERNEL_BLK_DEV
 	select ADK_KERNEL_BLK_DEV_SD
+	default y if ADK_TARGET_SYSTEM_QEMU_ARM
 	default y if ADK_TARGET_SYSTEM_QEMU_I686
 	default y if ADK_TARGET_SYSTEM_QEMU_MIPS
 	default y if ADK_TARGET_SYSTEM_QEMU_MIPSEL