diff options
| -rw-r--r-- | package/Config.in | 2 | ||||
| -rw-r--r-- | package/adk-helper/Makefile | 2 | ||||
| -rw-r--r-- | package/alix-switch/Makefile | 4 | ||||
| -rw-r--r-- | package/cfgfs/Makefile | 4 | ||||
| -rw-r--r-- | package/cryptinit/Makefile | 2 | ||||
| -rw-r--r-- | package/fwinstall/Makefile (renamed from package/adkinstall/Makefile) | 16 | ||||
| -rw-r--r-- | package/fwinstall/src/fwinstall (renamed from package/adkinstall/src/adkinstall) | 0 | ||||
| -rw-r--r-- | package/fwupdate/Makefile | 2 | ||||
| -rw-r--r-- | package/kexecinit/Makefile | 2 | ||||
| -rw-r--r-- | package/section.lst | 2 |
10 files changed, 18 insertions, 18 deletions
diff --git a/package/Config.in b/package/Config.in index f1d04185a..5b97dfa02 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2,8 +2,8 @@ menu "Base system" source package/Config.in.auto.base.boot source package/Config.in.auto.base.libs source package/Config.in.auto.base.apps +source package/Config.in.auto.base.adk source package/Config.in.auto.base.shells -source package/Config.in.auto.base.misc source package/Config.in.auto.base.tests endmenu diff --git a/package/adk-helper/Makefile b/package/adk-helper/Makefile index a6e5d4025..821aefaf4 100644 --- a/package/adk-helper/Makefile +++ b/package/adk-helper/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= adk-helper PKG_VERSION:= 1.0 PKG_RELEASE:= 2 PKG_DESCR:= adk helper utilities -PKG_SECTION:= base/misc +PKG_SECTION:= base/adk PKG_CFLINE_ADK_HELPER:= depends on ADK_HOST_ONLY diff --git a/package/alix-switch/Makefile b/package/alix-switch/Makefile index 4e3a280eb..dbc01b8cf 100644 --- a/package/alix-switch/Makefile +++ b/package/alix-switch/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= alix-switch PKG_VERSION:= 1.0 PKG_RELEASE:= 4 PKG_DESCR:= daemon listening on button events -PKG_SECTION:= base/misc -PKG_URL:= http://openadk.org/ +PKG_SECTION:= sys/misc +PKG_URL:= http://www.openadk.org/ PKG_SYSTEM_DEPENDS:= pcengines-alix2d2 pcengines-alix2d13 diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile index 31d20ad1d..addec9a7f 100644 --- a/package/cfgfs/Makefile +++ b/package/cfgfs/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= cfgfs PKG_VERSION:= 1.0.10 PKG_RELEASE:= 4 PKG_DESCR:= compressed config filesystem -PKG_SECTION:= base/apps -PKG_URL:= http://openadk.org/ +PKG_SECTION:= base/adk +PKG_URL:= http://www.openadk.org/ PKG_CFLINE_CFGFS:= select BUSYBOX_COMM@ PKG_CFLINE_CFGFS+= select BUSYBOX_DIFF@ diff --git a/package/cryptinit/Makefile b/package/cryptinit/Makefile index 87a27b257..0dc39eac4 100644 --- a/package/cryptinit/Makefile +++ b/package/cryptinit/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= cryptinit PKG_VERSION:= 2.0 PKG_RELEASE:= 1 PKG_DESCR:= init for encrypted rootfilesystem -PKG_SECTION:= base/misc +PKG_SECTION:= base/adk PKG_DEPENDS:= cryptsetup PKG_CFLINE_CRYPTINIT:= select BUSYBOX_STTY@ diff --git a/package/adkinstall/Makefile b/package/fwinstall/Makefile index 639a74de3..fab528148 100644 --- a/package/adkinstall/Makefile +++ b/package/fwinstall/Makefile @@ -3,11 +3,11 @@ include ${ADK_TOPDIR}/rules.mk -PKG_NAME:= adkinstall -PKG_VERSION:= 2.0 -PKG_RELEASE:= 4 +PKG_NAME:= fwinstall +PKG_VERSION:= 1.0 +PKG_RELEASE:= 1 PKG_DESCR:= disk/flash installer -PKG_SECTION:= base/misc +PKG_SECTION:= base/adk PKG_DEPENDS:= mke2fs parted sfdisk dosfstools mksh PKG_DEPENDS+= grub grub-tools PKG_KDEPENDS:= ext4-fs @@ -16,14 +16,14 @@ NO_DISTFILES:= 1 include ${ADK_TOPDIR}/mk/package.mk -$(eval $(call PKG_template,ADKINSTALL,adkinstall,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,FWINSTALL,fwinstall,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual -do-install: - $(INSTALL_DIR) $(IDIR_ADKINSTALL)/sbin - $(INSTALL_BIN) ./src/adkinstall $(IDIR_ADKINSTALL)/sbin +fwinstall-install: + $(INSTALL_DIR) $(IDIR_FWINSTALL)/usr/sbin + $(INSTALL_BIN) $(WRKBUILD)/fwinstall $(IDIR_FWINSTALL)/usr/sbin include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/adkinstall/src/adkinstall b/package/fwinstall/src/fwinstall index 90ceb77ec..90ceb77ec 100644 --- a/package/adkinstall/src/adkinstall +++ b/package/fwinstall/src/fwinstall diff --git a/package/fwupdate/Makefile b/package/fwupdate/Makefile index 2677dc818..729ea6def 100644 --- a/package/fwupdate/Makefile +++ b/package/fwupdate/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= fwupdate PKG_VERSION:= 1.0 PKG_RELEASE:= 1 PKG_DESCR:= update firmware -PKG_SECTION:= sys/misc +PKG_SECTION:= base/adk PKG_URL:= http://www.openadk.org NO_DISTFILES:= 1 diff --git a/package/kexecinit/Makefile b/package/kexecinit/Makefile index a9b2df084..df6e30c54 100644 --- a/package/kexecinit/Makefile +++ b/package/kexecinit/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= kexecinit PKG_VERSION:= 1.0 PKG_RELEASE:= 1 PKG_DESCR:= init for kexec rootfilesystem -PKG_SECTION:= base/misc +PKG_SECTION:= base/adk WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_VERSION} NO_DISTFILES:= 1 diff --git a/package/section.lst b/package/section.lst index 845abff10..b223dd094 100644 --- a/package/section.lst +++ b/package/section.lst @@ -1,7 +1,7 @@ base/boot Boot Loaders base/libs Base Libraries base/apps Base System -base/misc Base Misc +base/adk Base OpenADK scripts base/tests Testsuites base/shells Shells sys/drivers Hardware drivers / externel Kernel modules |